From iceway.git@gmail.com Sat Jun 9 09:26:42 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Sat, 09 Jun 2012 09:26:45 +0200 (CEST) Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]:56690 "EHLO mail-lpp01m010-f49.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903555Ab2FIH0m (ORCPT ); Sat, 9 Jun 2012 09:26:42 +0200 Received: by laap9 with SMTP id p9so2008851laa.36 for ; Sat, 09 Jun 2012 00:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=4V8i6B86gYh2PUIEoTWAHZIIfBbarL5StJXWV1s4/Yc=; b=Odhj9KDSGCGKRGp1VYdWwkphX5M6CjW6uyLjGrqyMGZTeIbsm/uzh8b07UOOlZCjru GNOLRMG9vHsbk+cusIfpjC+XSFlnWKNVSstT2yGw8cunZGrnIL8YgF49qk6SO6BkDDCU NLOZu0rRPvdvGio4u2u4Kq6QhO6PM8KilxLDWqaqXAysBE802mCkgmLMNTj50rk8t+4g JVr/tYVIN5B3cRPNABmvPQtjZ0T4JciuEtoxcW4W+3JoW+Ktz5CFFzJiKl+CE5tebAEe z7JHp5MtVcMF96TdGDXNoASsys6PL82O2N50+EZWsHYmc8dvCWND7hJxAIQOO3hYhaHm z6OQ== MIME-Version: 1.0 Received: by 10.152.104.171 with SMTP id gf11mr11131692lab.5.1339226796418; Sat, 09 Jun 2012 00:26:36 -0700 (PDT) Received: by 10.112.102.136 with HTTP; Sat, 9 Jun 2012 00:26:36 -0700 (PDT) Date: Sat, 9 Jun 2012 15:26:36 +0800 Message-ID: Subject: correct a little wrong in configure.ac file From: Iceway Zhang To: freecwmp@linux-mips.org Content-Type: multipart/mixed; boundary=f46d04083de779660604c2050920 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 30 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: iceway.git@gmail.com Precedence: bulk X-list: freecwmp --f46d04083de779660604c2050920 Content-Type: multipart/alternative; boundary=f46d04083de779660104c205091e --f46d04083de779660104c205091e Content-Type: text/plain; charset=ISO-8859-1 Hi Luka, Please help to review this patch, thanks! Iceway Zhang (1): correct for libubox-include-path and add AC_SUBST for libubox-lib-path configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Regards, Iceway --f46d04083de779660104c205091e Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi Luka,
Please help to review this patch, thanks!

Iceway Zhang (= 1):
=A0 correct for libubox-include-path and add AC_SUBST for
=A0=A0= =A0 libubox-lib-path

=A0configure.ac= |=A0=A0=A0 3 ++-
=A01 file changed, 2 insertions(+), 1 deletion(-)

Regards,
Iceway=

--f46d04083de779660104c205091e-- --f46d04083de779660604c2050920 Content-Type: application/octet-stream; name="0001-correct-for-libubox-include-path-and-add-AC_SUBST-fo.patch" Content-Disposition: attachment; filename="0001-correct-for-libubox-include-path-and-add-AC_SUBST-fo.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h38d0uwz0 RnJvbSBlYzQ0YmMzMzIyYzU3NzA4NmUwMDhkYWZmMjk0Mjk1MGUxYzU3ZjNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJY2V3YXkgWmhhbmcgPGljZXdheS5naXRAZ21haWwuY29tPgpE YXRlOiBTYXQsIDkgSnVuIDIwMTIgMTQ6MjA6MTUgKzA4MDAKU3ViamVjdDogW1BBVENIIDEvMV0g Y29ycmVjdCBmb3IgbGlidWJveC1pbmNsdWRlLXBhdGggYW5kIGFkZCBBQ19TVUJTVCBmb3IKIGxp YnVib3gtbGliLXBhdGgKClNpZ25lZC1vZmYtYnk6IEljZXdheSBaaGFuZyA8aWNld2F5LmdpdEBn bWFpbC5jb20+Ci0tLQogY29uZmlndXJlLmFjIHwgICAgMyArKy0KIDEgZmlsZSBjaGFuZ2VkLCAy IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9jb25maWd1cmUuYWMg Yi9jb25maWd1cmUuYWMKaW5kZXggZDA5YjVmNS4uYTU4NDIzYyAxMDA2NDQKLS0tIGEvY29uZmln dXJlLmFjCisrKyBiL2NvbmZpZ3VyZS5hYwpAQCAtNDYsMTAgKzQ2LDExIEBAIEFDX0FSR19XSVRI KFtsaWJ1Ym94LWluY2x1ZGUtcGF0aF0sCiAgICAgW2xvY2F0aW9uIG9mIHRoZSBsaWJ1Ym94IGxp YnJhcnkgaGVhZGVycywgZGVmYXVsdHMgdG8gL3Vzci9pbmNsdWRlXSldLAogICBbTElCVUJPWF9D RkxBR1M9Ii1JJHdpdGh2YWwiXSwKICAgW0xJQlVCT1hfQ0ZMQUdTPSctSS91c3IvaW5jbHVkZSdd KQotQUNfU1VCU1QoW0xJQlVDSV9DRkxBR1NdKQorQUNfU1VCU1QoW0xJQlVCT1hfQ0ZMQUdTXSkK IAogQUNfQVJHX1dJVEgoW2xpYnVib3gtbGliLXBhdGhdLAogICBbQVNfSEVMUF9TVFJJTkcoWy0t d2l0aC1saWJ1Ym94LWxpYi1wYXRoXSwgW2xvY2F0aW9uIG9mIHRoZSBsaWJ1Ym94IGxpYnJhcnld KV0gW0xJQlVCT1hfTERGTEFHUz0iLUwkd2l0aHZhbCJdKQorQUNfU1VCU1QoW0xJQlVCT1hfTERG TEFHU10pCiAKIExJQlVCT1hfTElCUz0nLWx1Ym94JwogQUNfU1VCU1QoW0xJQlVCT1hfTElCU10p Ci0tIAoxLjcuOS41Cgo= --f46d04083de779660604c2050920-- From iceway.git@gmail.com Sat Jun 9 10:28:03 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Sat, 09 Jun 2012 10:28:06 +0200 (CEST) Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]:54811 "EHLO mail-lpp01m010-f49.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1901163Ab2FII2D (ORCPT ); Sat, 9 Jun 2012 10:28:03 +0200 Received: by laap9 with SMTP id p9so2027350laa.36 for ; Sat, 09 Jun 2012 01:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=gbDfOjwzrq1GGp1GPPUDKOyCgQlRnaTqxCPv2R5sTSc=; b=g/II2ojckifYbVoR/tBj/U1WzHbdrwdc2ZkrNgmEEgRAHhJcVUeCDlHl2hJeJMHy9W t76KsGGGToYm2mzZNSivCWkHGsPTlkaXcwshoOWs/crWtEtmnwbmqy+jT+brDwjhkDr3 KrkX9zwjVuodc4HqUXp963e70a8ODD44QeQvYr0SUUBzvnf/n9ueA2LbJI1K0aUiOGfx kfzsJk1cxrj1nXNlVLqCBQ0yAwuKumCu0U0FqK9NNiiXST1DrLeM1vrFzZ/CgoxDeVyD gDIV+529BY2mwMDI9BytOYfvDiDRNp4KUuP409QmDUvcK03x+MJpiyUvNgtHq8IhQOtj 4g0w== MIME-Version: 1.0 Received: by 10.152.132.40 with SMTP id or8mr11194806lab.24.1339230477916; Sat, 09 Jun 2012 01:27:57 -0700 (PDT) Received: by 10.112.102.136 with HTTP; Sat, 9 Jun 2012 01:27:57 -0700 (PDT) In-Reply-To: References: Date: Sat, 9 Jun 2012 16:27:57 +0800 Message-ID: Subject: Re: correct a little wrong in configure.ac file From: Iceway Zhang To: freecwmp@linux-mips.org Content-Type: multipart/mixed; boundary=f46d042c5ed7e89b8504c205e4b8 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 31 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: iceway.git@gmail.com Precedence: bulk X-list: freecwmp --f46d042c5ed7e89b8504c205e4b8 Content-Type: multipart/alternative; boundary=f46d042c5ed7e89b8004c205e4b6 --f46d042c5ed7e89b8004c205e4b6 Content-Type: text/plain; charset=ISO-8859-1 Hi Luka, Sorry, I forgot one line change in previous patch, please ignore previous patch and use the new patch in attached. Thanks! On Sat, Jun 9, 2012 at 3:26 PM, Iceway Zhang wrote: > Hi Luka, > Please help to review this patch, thanks! > > Iceway Zhang (1): > correct for libubox-include-path and add AC_SUBST for > libubox-lib-path > > configure.ac | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > Regards, > Iceway > > --f46d042c5ed7e89b8004c205e4b6 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi Luka,
Sorry, I forgot one line change in previous patch, please ignor= e previous patch and use the new patch in attached.
Thanks!

On Sat, Jun 9, 2012 at 3:26 PM, Iceway Zhang <ice= way.git@gmail.com> wrote:
Hi Luka,
Please help to review this patch= , thanks!

Iceway Zhang (1):
=A0 correct for libubox-include-path = and add AC_SUBST for
=A0=A0=A0 libubox-lib-path

=A0configure.ac |=A0=A0=A0 3 ++-
=A01 file changed, 2 insertions(+), 1 deletion(-)

Regards,
Iceway=


--f46d042c5ed7e89b8004c205e4b6-- --f46d042c5ed7e89b8504c205e4b8 Content-Type: application/octet-stream; name="0001-correct-for-libubox-include-path-and-add-AC_SUBST-fo.patch" Content-Disposition: attachment; filename="0001-correct-for-libubox-include-path-and-add-AC_SUBST-fo.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h38f8ryk1 RnJvbSAxZjY1MTRlNWEwYmFkYWZmYWUyNzAyNDIxZWUxN2Q2Yjk0MWY2Y2Y4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJY2V3YXkgWmhhbmcgPGljZXdheS5naXRAZ21haWwuY29tPgpE YXRlOiBTYXQsIDkgSnVuIDIwMTIgMTQ6MjA6MTUgKzA4MDAKU3ViamVjdDogW1BBVENIIDEvMV0g Y29ycmVjdCBmb3IgbGlidWJveC1pbmNsdWRlLXBhdGggYW5kIGFkZCBBQ19TVUJTVCBmb3IKIGxp YnVib3gtbGliLXBhdGgKClNpZ25lZC1vZmYtYnk6IEljZXdheSBaaGFuZyA8aWNld2F5LmdpdEBn bWFpbC5jb20+Ci0tLQogY29uZmlndXJlLmFjIHwgICAgNSArKystLQogMSBmaWxlIGNoYW5nZWQs IDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9jb25maWd1cmUu YWMgYi9jb25maWd1cmUuYWMKaW5kZXggZDA5YjVmNS4uZTIyZWUyMCAxMDA2NDQKLS0tIGEvY29u ZmlndXJlLmFjCisrKyBiL2NvbmZpZ3VyZS5hYwpAQCAtNDYsMTAgKzQ2LDExIEBAIEFDX0FSR19X SVRIKFtsaWJ1Ym94LWluY2x1ZGUtcGF0aF0sCiAgICAgW2xvY2F0aW9uIG9mIHRoZSBsaWJ1Ym94 IGxpYnJhcnkgaGVhZGVycywgZGVmYXVsdHMgdG8gL3Vzci9pbmNsdWRlXSldLAogICBbTElCVUJP WF9DRkxBR1M9Ii1JJHdpdGh2YWwiXSwKICAgW0xJQlVCT1hfQ0ZMQUdTPSctSS91c3IvaW5jbHVk ZSddKQotQUNfU1VCU1QoW0xJQlVDSV9DRkxBR1NdKQorQUNfU1VCU1QoW0xJQlVCT1hfQ0ZMQUdT XSkKIAogQUNfQVJHX1dJVEgoW2xpYnVib3gtbGliLXBhdGhdLAotICBbQVNfSEVMUF9TVFJJTkco Wy0td2l0aC1saWJ1Ym94LWxpYi1wYXRoXSwgW2xvY2F0aW9uIG9mIHRoZSBsaWJ1Ym94IGxpYnJh cnldKV0gW0xJQlVCT1hfTERGTEFHUz0iLUwkd2l0aHZhbCJdKQorICBbQVNfSEVMUF9TVFJJTkco Wy0td2l0aC1saWJ1Ym94LWxpYi1wYXRoXSwgW2xvY2F0aW9uIG9mIHRoZSBsaWJ1Ym94IGxpYnJh cnldKV0sIFtMSUJVQk9YX0xERkxBR1M9Ii1MJHdpdGh2YWwiXSkKK0FDX1NVQlNUKFtMSUJVQk9Y X0xERkxBR1NdKQogCiBMSUJVQk9YX0xJQlM9Jy1sdWJveCcKIEFDX1NVQlNUKFtMSUJVQk9YX0xJ QlNdKQotLSAKMS43LjkuNQoK --f46d042c5ed7e89b8504c205e4b8-- From jonas.gorski@gmail.com Sat Jun 9 13:16:49 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Sat, 09 Jun 2012 13:16:53 +0200 (CEST) Received: from mail-bk0-f49.google.com ([209.85.214.49]:62722 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903555Ab2FILQt (ORCPT ); Sat, 9 Jun 2012 13:16:49 +0200 Received: by bkwj4 with SMTP id j4so3079623bkw.36 for ; Sat, 09 Jun 2012 04:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=vz/ZPSbsZ6x5Vqsl7xO7xlBv2V06eiRDIaqD13WpNiY=; b=tEUzuQqE6lETlsG6ORqCt7ZPBcT6LUh62yZrd60d+8qnm9Rf3cCkDE8u/yd2ZZDmWf dgXwFooKsmOrgpTbbg/WPrUxtCl64EQXmayyO4W4IV2vbws4yxGfUKeZLw3UP7dxTCa/ 8kphO4IyMI8QlAxuDG2rbDJVBR/bYJqbJUIDcd8GXkcye5oJFRFdpQsOqMjFKhb4TVbS IgHfpInxw34b8E/S6o3vXu150uKTGUgZFLbVK/uMfjZKgqGCQT+iQxPfJgcjB8Bo09kp TCyAzQeHeZ15NtYpKuLilOxfhmcP38OaopTPwi3UAIJDCDSO12zxGcsnDgNb0/x9HK5U S75Q== Received: by 10.205.33.136 with SMTP id so8mr7511294bkb.1.1339240603644; Sat, 09 Jun 2012 04:16:43 -0700 (PDT) Received: from shaker64.lan (dslb-088-073-034-083.pools.arcor-ip.net. [88.73.34.83]) by mx.google.com with ESMTPS id 9sm10249570bku.9.2012.06.09.04.16.42 (version=SSLv3 cipher=OTHER); Sat, 09 Jun 2012 04:16:42 -0700 (PDT) From: Jonas Gorski To: freecwmp@linux-mips.org Subject: [PATCH] freecwmp: use buildvariants for libcurl/libzstream Date: Sat, 9 Jun 2012 13:16:24 +0200 Message-Id: <1339240584-4992-1-git-send-email-jonas.gorski@gmail.com> X-Mailer: git-send-email 1.7.2.5 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 32 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: jonas.gorski@gmail.com Precedence: bulk X-list: freecwmp Build freecwmp using build variants for easier inclusion as a default package with the desired http library. Since there are then two freecwmp packages, it does not make sense using a menu, so convert the menu to inline options. Also make the package configuration depend on the config options, so changing them triggers a rebuild of freecwmp. Contributed by T-Labs, Deutsche Telekom Innovation Laboratories Signed-off-by: Jonas Gorski --- The latest change is currently ineffective as freecwmp itself does not rebuild obsolete object files even if configure changed options. freecwmp/Config.in | 18 ++---------------- freecwmp/Makefile | 46 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/freecwmp/Config.in b/freecwmp/Config.in index 47ff609..95f3583 100644 --- a/freecwmp/Config.in +++ b/freecwmp/Config.in @@ -1,24 +1,10 @@ -menu "Configuration" - depends on PACKAGE_freecwmp +if PACKAGE_freecwmp-curl || PACKAGE_freecwmp-zstream config FREECWMP_SCRIPTS_FULL bool "Install all freecwmp scripts" default y choice - prompt "Select HTTP library" - default FREECWMP_HTTP_ZSTREAM - - config FREECWMP_HTTP_ZSTREAM - bool "libzstream" - select PACKAGE_libzstream - - config FREECWMP_HTTP_CURL - bool "libcurl" - select PACKAGE_libcurl -endchoice - -choice prompt "Select ACS sever" default FREECWMP_ACS_MULTI @@ -37,4 +23,4 @@ config FREECWMP_DEVEL_DEBUG bool "Compile with development debug options" default n -endmenu +endif diff --git a/freecwmp/Makefile b/freecwmp/Makefile index 510c94e..0996417 100644 --- a/freecwmp/Makefile +++ b/freecwmp/Makefile @@ -19,24 +19,45 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_FIXUP:=autoreconf +PKG_CONFIG_DEPENDS:= \ + CONFIG_FREECWMP_ACS_MULTI \ + CONFIG_FREECWMP_ACS_HDM \ + CONFIG_FREECWMP_DEBUG \ + CONFIG_FREECWMP_DEVEL_DEBUG + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk -define Package/freecwmp +define Package/freecwmp/Default SECTION:=utils CATEGORY:=Utilities TITLE:=CWMP client - DEPENDS:=+libubox +libmicroxml +shflags +CONFIG_FREECWMP_HTTP_ZSTREAM:libzstream +CONFIG_FREECWMP_HTTP_CURL:libcurl - MENU:=1 -endef - -define Package/freecwmp/config - source "$(SOURCE)/Config.in" + DEPENDS:=+libubox +libmicroxml +shflags endef define Package/freecwmp/description A free client implementation of CWMP (TR-069) protocol. endef +define Package/freecwmp-curl + $(call Package/freecwmp/Default) + TITLE+= (using libcurl) + DEPENDS += +libcurl + VARIANT:=curl +endef + +define Package/freecwmp-zstream + $(call Package/freecwmp/Default) + TITLE += (using libzstream) + DEPENDS += +libzstream + VARIANT:=zstream +endef + +define Package/freecwmp-zstream/config + source "$(SOURCE)/Config.in" +endef + USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1) ifneq ($(USE_LOCAL),) define Build/Prepare @@ -53,13 +74,13 @@ TARGET_LDFLAGS += \ CONFIGURE_ARGS += \ --with-uci-include-path=$(STAGING_DIR)/usr/include -ifeq ($(CONFIG_FREECWMP_HTTP_ZSTREAM),y) +ifeq ($(BUILD_VARIANT),zstream) CONFIGURE_ARGS += \ --enable-http=zstream \ --with-zstream-include-path=$(STAGING_DIR)/usr/include endif -ifeq ($(CONFIG_FREECWMP_HTTP_CURL),y) +ifeq ($(BUILD_VARIANT),curl) CONFIGURE_ARGS += \ --enable-http=curl endif @@ -84,12 +105,12 @@ CONFIGURE_ARGS += \ --enable-devel-debug endif -define Package/freecwmp/conffiles +define Package/freecwmp-$(BUILD_VARIANT)/conffiles /etc/config/freecwmp /usr/share/freecwmp/defaults endef -define Package/freecwmp/install +define Package/freecwmp-$(BUILD_VARIANT)/install $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/bin/freecwmpd $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/config @@ -105,4 +126,5 @@ ifeq ($(CONFIG_FREECWMP_SCRIPTS_FULL),y) endif endef -$(eval $(call BuildPackage,freecwmp)) +$(eval $(call BuildPackage,freecwmp-curl)) +$(eval $(call BuildPackage,freecwmp-zstream)) -- 1.7.10 From freecwmp@lukaperkov.net Mon Jun 11 01:38:38 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Mon, 11 Jun 2012 01:38:42 +0200 (CEST) Received: from mail-wg0-f43.google.com ([74.125.82.43]:41764 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903597Ab2FJXii (ORCPT ); Mon, 11 Jun 2012 01:38:38 +0200 Received: by wgbdr1 with SMTP id dr1so2306427wgb.24 for ; Sun, 10 Jun 2012 16:38:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=ocKescSzr71eex/X9/6Jso0gaQKgpAEORwJG3csYPKA=; b=M/Q/uq3Eb/ISi9M7lfXftOERCyO+hv+8mgT66TjXYr61FJN+ucFs+pfm94JdPlJKMy 9k7qma6NWkxfMF7l+KFcYt36S8XqZpf42aWTLij2cZq5F/ZwSILHTtq41KiyzUw/84Jf Z8LUO4NmBKK5ydsotAPmRgIxqpfttKUP/aY4gdfgFa/mOzVIJy8+mrVS/lYLvbIp4Wnj xBAtg+3m4mIEDUA7Zp/Tz/l0G2QSB25Zf3hYBRyA8kJwEs+sqWMu/3lCaBtQ97YWuFJ8 iBz6dJtRSsrZw9URvHeqSDn6ufxppmFUyJO1JzA/UwWPQrXhOdiS2TguABP83ansrGkh Tgiw== Received: by 10.180.85.129 with SMTP id h1mr16176195wiz.2.1339371512990; Sun, 10 Jun 2012 16:38:32 -0700 (PDT) Received: from localhost (213-191-157-192.dhcp.iskon.hr. [213.191.157.192]) by mx.google.com with ESMTPS id et10sm20358887wib.2.2012.06.10.16.38.31 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jun 2012 16:38:32 -0700 (PDT) Date: Mon, 11 Jun 2012 01:38:32 +0200 From: Luka Perkov To: Benjamin Larsson Cc: freecwmp@linux-mips.org Subject: Re: [PATCH] compile fix to make it more easy to build on backfire Message-ID: <20120610233832.GA17382@w500.iskon.local> Mail-Followup-To: Benjamin Larsson , freecwmp@linux-mips.org References: <4FC4E18E.10508@southpole.se> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4FC4E18E.10508@southpole.se> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmycx6BDIx0g4NLNYFBRYZzSW8eJRSI4BCKQ6JDGTDIQT0fTllbKEZtKa8T1xvWo36RE/pf Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 33 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: freecwmp@lukaperkov.net Precedence: bulk X-list: freecwmp Hi Benjamin, On Tue, May 29, 2012 at 04:47:42PM +0200, Benjamin Larsson wrote: > ../src/cwmp/external.c: In function 'external_get_parameter': > ../src/cwmp/external.c:91: error: incompatible type for argument 1 of 'wait' > ../src/cwmp/external.c: In function 'external_set_parameter_execute': > ../src/cwmp/external.c:197: error: incompatible type for argument 1 > of 'wait' > ../src/cwmp/external.c: In function 'external_simple': > ../src/cwmp/external.c:246: error: incompatible type for argument 1 > of 'wait' > make[4]: *** [freecwmpd-external.o] Error 1 Applied with minor changes. Thank you. Regards, Luka From freecwmp@lukaperkov.net Mon Jun 11 01:41:44 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Mon, 11 Jun 2012 01:41:48 +0200 (CEST) Received: from mail-wi0-f171.google.com ([209.85.212.171]:36320 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903597Ab2FJXlo (ORCPT ); Mon, 11 Jun 2012 01:41:44 +0200 Received: by wibhm14 with SMTP id hm14so2018773wib.6 for ; Sun, 10 Jun 2012 16:41:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=ehwznEVsYEYz0xcaen3OFJbXIJbixId7jS/z52rCcPA=; b=Cqm8Fo3nWlGNWN3uA5KclsbvgSOrfa/e5Gs+hKijpz23dgGf5L2kW0qxtGPLrWBTU1 YbVaqN2SZo/O1bE8GhbQAZwlV26XgktA1tOn37ojFUT2u4xxozHowB19Eqpvq2JfBbYY mvqStBKFe8MOf51LxA5d9tmxUWFbRhdJyQ66YGkgv3tfT0gVX4sl1mp9f+3KU3YAGg9j 3DBmnmhzSEx/l87vP3tNVk/3Wg9M4TcahleZ5x/5xnSgS2/X01up/qyxP/mURlulBgoE P57h/DXFzJfuGQC5ezDD56bVFU8hrTfmjRWFx9IvWf1iLGFFLiR/2LZQAxF3ZM52Eywp 7+xQ== Received: by 10.180.80.74 with SMTP id p10mr16355739wix.10.1339371696674; Sun, 10 Jun 2012 16:41:36 -0700 (PDT) Received: from localhost (213-191-157-192.dhcp.iskon.hr. [213.191.157.192]) by mx.google.com with ESMTPS id q6sm20747011wiy.0.2012.06.10.16.41.35 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jun 2012 16:41:36 -0700 (PDT) Date: Mon, 11 Jun 2012 01:41:36 +0200 From: Luka Perkov To: Iceway Zhang Cc: freecwmp@linux-mips.org Subject: Re: correct a little wrong in configure.ac file Message-ID: <20120610234136.GB17382@w500.iskon.local> Mail-Followup-To: Iceway Zhang , freecwmp@linux-mips.org References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQl/KF3zVE7ZyBjQZCA7ETWddCasLJNILNV366C2be3utBKPJCsVtEbo41UIe0tFUvkFQJev Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 34 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: freecwmp@lukaperkov.net Precedence: bulk X-list: freecwmp Hi Iceway, On Sat, Jun 09, 2012 at 04:27:57PM +0800, Iceway Zhang wrote: > Hi Luka, > Sorry, I forgot one line change in previous patch, please ignore previous > patch and use the new patch in attached. > Thanks! Thank you for sending this patch. If you have any questions or problems let us know. Regards, Luka From freecwmp@lukaperkov.net Mon Jun 11 01:43:10 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Mon, 11 Jun 2012 01:43:13 +0200 (CEST) Received: from mail-wg0-f43.google.com ([74.125.82.43]:49461 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903597Ab2FJXnK (ORCPT ); Mon, 11 Jun 2012 01:43:10 +0200 Received: by wgbdr1 with SMTP id dr1so2307829wgb.24 for ; Sun, 10 Jun 2012 16:43:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=WXbo0vdxrGtbyWfKUEbA0PMry0m2GbKZh9pE4pxhhvI=; b=VCdyP1QViFy/EboTyX9V/cd+CybNuXYAFVnwzKkditZwm0OVFqsbVlXY37uXgsPHMs xF7/iCPXiKug1jaOvD75KPkTkOHmsTIu3rD+MdZwX0Jsyk/YJJt0Z2org1HGBt6PVqh7 81es3J4rmBC13TBD1GBoiP+t3bZUl60ZaFLRq2mLO4vQTj6tA8qMEkMHFwT54EUjoi7M vjZcFkKdI/e4UcGYcLBmo5FhNkUsDAYHNjYu8ifjPIKEfuWqTRBlbvLKHE4tx4QQlo68 fef3WRCEhqlXQM72Plc/XoLevJDuYD6xYC87skKWHLcvuw6z9t8i9gOZuFswpmCWqXRY Qyqg== Received: by 10.180.78.161 with SMTP id c1mr16171352wix.1.1339371784764; Sun, 10 Jun 2012 16:43:04 -0700 (PDT) Received: from localhost (213-191-157-192.dhcp.iskon.hr. [213.191.157.192]) by mx.google.com with ESMTPS id hv7sm32345290wib.0.2012.06.10.16.43.03 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jun 2012 16:43:04 -0700 (PDT) Date: Mon, 11 Jun 2012 01:43:04 +0200 From: Luka Perkov To: Jonas Gorski Cc: freecwmp@linux-mips.org Subject: Re: [PATCH] freecwmp: use buildvariants for libcurl/libzstream Message-ID: <20120610234304.GC17382@w500.iskon.local> Mail-Followup-To: Jonas Gorski , freecwmp@linux-mips.org References: <1339240584-4992-1-git-send-email-jonas.gorski@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1339240584-4992-1-git-send-email-jonas.gorski@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkybXdG06hbE5baQ2pg+IbgiQbL+Z/9zdodNWwUD4v5gQzIkv37I42Wqu5OuzlTq7dDx/LR Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 35 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: freecwmp@lukaperkov.net Precedence: bulk X-list: freecwmp Hi Jonas, On Sat, Jun 09, 2012 at 01:16:24PM +0200, Jonas Gorski wrote: > Build freecwmp using build variants for easier inclusion as a default > package with the desired http library. > > Since there are then two freecwmp packages, it does not make sense using > a menu, so convert the menu to inline options. Also make the package > configuration depend on the config options, so changing them triggers > a rebuild of freecwmp. > > Contributed by T-Labs, Deutsche Telekom Innovation Laboratories > > Signed-off-by: Jonas Gorski > --- I have applied your patch with minor changes. Thank you. Regards, Luka From iceway.git@gmail.com Mon Jun 11 08:15:19 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Mon, 11 Jun 2012 08:15:22 +0200 (CEST) Received: from mail-lb0-f177.google.com ([209.85.217.177]:51820 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903599Ab2FKGPS (ORCPT ); Mon, 11 Jun 2012 08:15:18 +0200 Received: by lbbgg6 with SMTP id gg6so2923534lbb.36 for ; Sun, 10 Jun 2012 23:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=0xaoUM6J1UuOc5vkkClN7cRN7blFHmmvcplLPfsdU8Q=; b=IX4UFEeQgqQUH251pZXGMbtUO8C5KrxHtF4d9l4SOrFn8RaAgbpalk7Ap7nAjEpvjj kviV16P/im1gLeR70Vnw5uWQry404mSTT40zf57gxPlvg+TaNIbMJr9qcwOiVpcPrNBx tqM4+gSLXrkYHr3VwrKYsjStiN+qqb0LXpGMr3a0tVr2FSxZlbsD82/K4uA8IPWMVh07 ZGjeOFLlxMeXUTDpH5gxbMBbiI//seB7NVFZzcKwsb7vl7mKzj94oecIpS+dN+InmI2Y Bs5WcwmMuxnhJJz/ESio5gw0ABIhea5YNFjVXYG/iS9z8uNjfTyH/OAcZ8FLkhs3lmtW dG4A== MIME-Version: 1.0 Received: by 10.112.27.226 with SMTP id w2mr2733096lbg.57.1339395313278; Sun, 10 Jun 2012 23:15:13 -0700 (PDT) Received: by 10.112.102.136 with HTTP; Sun, 10 Jun 2012 23:15:13 -0700 (PDT) In-Reply-To: <20120610234136.GB17382@w500.iskon.local> References: <20120610234136.GB17382@w500.iskon.local> Date: Mon, 11 Jun 2012 14:15:13 +0800 Message-ID: Subject: Re: correct a little wrong in configure.ac file From: Iceway Zhang To: Iceway Zhang , freecwmp@linux-mips.org Content-Type: multipart/alternative; boundary=bcaec554de62dc9e3a04c22c45eb Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 36 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: iceway.git@gmail.com Precedence: bulk X-list: freecwmp --bcaec554de62dc9e3a04c22c45eb Content-Type: text/plain; charset=ISO-8859-1 Hi Luka, I'm reading and studing your code now, any quesions and problems find, I will share you. On Mon, Jun 11, 2012 at 7:41 AM, Luka Perkov wrote: > Hi Iceway, > > On Sat, Jun 09, 2012 at 04:27:57PM +0800, Iceway Zhang wrote: > > Hi Luka, > > Sorry, I forgot one line change in previous patch, please ignore previous > > patch and use the new patch in attached. > > Thanks! > > Thank you for sending this patch. If you have any questions or problems > let us know. > > Regards, > Luka > --bcaec554de62dc9e3a04c22c45eb Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi Luka,
I'm reading and studing your code now, any quesions and pro= blems find, I will share you.

On Mon, Jun= 11, 2012 at 7:41 AM, Luka Perkov <freecwmp@lukaperkov.net> wrote:
Hi Iceway,

On Sat, Jun 09, 2012 at 04:27:57PM +0800, Iceway Zhang wrote:
> Hi Luka,
> Sorry, I forgot one line change in previous patch, please ignore previ= ous
> patch and use the new patch in attached.
> Thanks!

Thank you for sending this patch. If you have any questions or proble= ms
let us know.

Regards,
Luka

--bcaec554de62dc9e3a04c22c45eb-- From jonas.gorski@gmail.com Tue Jun 12 14:28:50 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Tue, 12 Jun 2012 14:28:54 +0200 (CEST) Received: from mail-bk0-f49.google.com ([209.85.214.49]:43377 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903699Ab2FLM2u (ORCPT ); Tue, 12 Jun 2012 14:28:50 +0200 Received: by bkwj4 with SMTP id j4so5549844bkw.36 for ; Tue, 12 Jun 2012 05:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=9RtOiuxcVO0yG2QGUwcHXY/6XMpB9RyYGfRtcPZXIR4=; b=MrZLThWQ0zJ9tfY1/idVOnfzr8IBx0cVzgB2BiRJZX2xJsYK2jsthYe9e4mlL4ivB5 Y7s/CvgIfGUpH6hFKJIFCArGalq+7Xl4eJyB7uhqI6/iqTJBLZ0n6lvHvcus4XUJash/ deG7BaUprm2PVn93VtIE7mqbqQDWHzaw/DytF8Y1BXNiLccEk2TZTx/B0F+Wt/xqw2vq g6nnLqQro8Kxnd+hJgl3+JcxYI5k0DsQe4dihajsezeGmWMxaWvwZVkRPP0T5JnVkilE hiuHEHKKcbISM6on0l5v5TeOhttFTVsbjKue9zmHbnW8QC8n5os2Jm2T0NtME5gkGRxo PuEA== Received: by 10.204.154.144 with SMTP id o16mr11882802bkw.107.1339504124836; Tue, 12 Jun 2012 05:28:44 -0700 (PDT) Received: from shaker64.lan (dslb-088-073-055-195.pools.arcor-ip.net. [88.73.55.195]) by mx.google.com with ESMTPS id fw10sm20154182bkc.11.2012.06.12.05.28.43 (version=SSLv3 cipher=OTHER); Tue, 12 Jun 2012 05:28:44 -0700 (PDT) From: Jonas Gorski To: freecwmp@linux-mips.org Subject: [PATCH] fix running in background when compiled with DEVEL_DEBUG Date: Tue, 12 Jun 2012 14:27:59 +0200 Message-Id: <1339504079-19340-1-git-send-email-jonas.gorski@gmail.com> X-Mailer: git-send-email 1.7.2.5 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 37 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: jonas.gorski@gmail.com Precedence: bulk X-list: freecwmp Don't close STDOUT and STDERR when running in devel debug mode, as freecwmp will continue writing to them. Contributed by T-Labs, Deutsche Telekom Innovation Laboratories Signed-off-by: Jonas Gorski --- src/freecwmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/freecwmp.c b/src/freecwmp.c index 35d89a1..39a0487 100644 --- a/src/freecwmp.c +++ b/src/freecwmp.c @@ -284,8 +284,10 @@ int main (int argc, char **argv) } close(STDIN_FILENO); +#ifndef DEVEL_DEBUG close(STDOUT_FILENO); close(STDERR_FILENO); +#endif } uloop_run(); -- 1.7.10 From freecwmp@lukaperkov.net Wed Jun 13 00:01:30 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Wed, 13 Jun 2012 00:01:33 +0200 (CEST) Received: from mail-wi0-f177.google.com ([209.85.212.177]:60147 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903744Ab2FLWBa (ORCPT ); Wed, 13 Jun 2012 00:01:30 +0200 Received: by wibhm14 with SMTP id hm14so4169505wib.6 for ; Tue, 12 Jun 2012 15:01:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=+CoC9UunbUqxuxP+MoEsaIHFDrT4OQ25Pl8ij7s+2rE=; b=oQfpGWyx3xKu/HtW8t+hpMAkDTFn+/kKW0jFGwOJ+rIm8Y0KVlE+MVmM+iaot5SDgl ySZ+/xmX420IU4WdV683VLZ+xG3dnlZATQ60opBRVxZ30c0HA/iXYyB9qhlVmko3BmCp gt4F3dM5jRBj1ztIyBkmM4ZSZlXRc/5pUEB24gtosdnoUKeYoz7nuXJJtV2gSHTIAJ7e sHDoH48bgNAMHCs4NsRt0BKG/vlBpNmIGvoFV9KUpaRQ2YBZJ/M+0BIVkFQhjhyno5Mm EHUjl2Q6e6qUN6h9uxPtJOPZoTtJu1iY+sF4NQgvR3GGDxIgQD2OajRyVKLxnS3lVu6D aQxQ== Received: by 10.180.82.195 with SMTP id k3mr32418805wiy.9.1339538484316; Tue, 12 Jun 2012 15:01:24 -0700 (PDT) Received: from localhost (zg07-054.dialin.iskon.hr. [213.191.150.55]) by mx.google.com with ESMTPS id e20sm7845677wiv.7.2012.06.12.15.01.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 15:01:23 -0700 (PDT) Date: Wed, 13 Jun 2012 00:01:24 +0200 From: Luka Perkov To: Jonas Gorski Cc: freecwmp@linux-mips.org Subject: Re: [PATCH] fix running in background when compiled with DEVEL_DEBUG Message-ID: <20120612220124.GA5533@w500.iskon.local> Mail-Followup-To: Jonas Gorski , freecwmp@linux-mips.org References: <1339504079-19340-1-git-send-email-jonas.gorski@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1339504079-19340-1-git-send-email-jonas.gorski@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkn4WuYupzXpZ+sOwEsrWGsKRrOcIlstzwfBJMA8KfyDhoL6lQ3QRTwveWGVFoCLvw3Oory Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 38 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: freecwmp@lukaperkov.net Precedence: bulk X-list: freecwmp Hi Jonas, On Tue, Jun 12, 2012 at 02:27:59PM +0200, Jonas Gorski wrote: > Don't close STDOUT and STDERR when running in devel debug mode, > as freecwmp will continue writing to them. > > Contributed by T-Labs, Deutsche Telekom Innovation Laboratories > > Signed-off-by: Jonas Gorski Applied. Thank you. Regards, Luka From jonas.gorski@gmail.com Mon Jun 18 16:46:33 2012 Received: with ECARTIS (v1.0.0; list freecwmp); Mon, 18 Jun 2012 16:46:40 +0200 (CEST) Received: from mail-bk0-f49.google.com ([209.85.214.49]:34161 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1903530Ab2FROqd (ORCPT ); Mon, 18 Jun 2012 16:46:33 +0200 Received: by bkwj4 with SMTP id j4so4679369bkw.36 for ; Mon, 18 Jun 2012 07:46:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=WgIfjoYSznwjFGAcJMNMJpNGavbJX1SZshR6/WKFt+Y=; b=Zb3YZn9Pz4XNDUqgmTJEH0JkPGxEDMni8EPs++aBaIZf2IpQLKHYu2OZcwLbaKyNGQ A0yYxRG4s8W+XQwI3RFjkP5dtpDQrGGT7/21GeY0CEAs+sxi12tkr4DjQJrR1H/evRUu suErjmkpiAghIBZ4l4GqPIOUq/+jMQ/QkV5gm++QSn/7S9K3R4nASvx15Qusfwuq9B91 WbmAVtUY6uf8QmCNZA/DYJOlffZGlu8R28Ed2tdDCNMk0O0mLbgfbI/MGmNAf8fVtYsL UUTjU17o3xKijcqcKFnGQwmQKhn2fa8u4kLR23OE+66BM+ktNzEVAzXFATzwrAlQAfX8 IWCQ== Received: by 10.204.156.217 with SMTP id y25mr6543722bkw.65.1340030787803; Mon, 18 Jun 2012 07:46:27 -0700 (PDT) Received: from ixxyvirt.lan (p50811E12.dip.t-dialin.net. [80.129.30.18]) by mx.google.com with ESMTPS id m2sm19119273bkm.2.2012.06.18.07.46.26 (version=SSLv3 cipher=OTHER); Mon, 18 Jun 2012 07:46:27 -0700 (PDT) From: Jonas Gorski To: freecwmp@linux-mips.org Subject: [PATCH] fix authentication check for connection requests Date: Mon, 18 Jun 2012 16:46:18 +0200 Message-Id: <1340030778-16412-1-git-send-email-jonas.gorski@gmail.com> X-Mailer: git-send-email 1.7.10 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s freecwmp"> (uid 0) X-Orcpt: rfc822;freecwmp@linux-mips.org Original-Recipient: rfc822;freecwmp@linux-mips.org X-archive-position: 39 X-ecartis-version: Ecartis v1.0.0 Sender: freecwmp-bounce@linux-mips.org Errors-to: freecwmp-bounce@linux-mips.org X-original-sender: jonas.gorski@gmail.com Precedence: bulk X-list: freecwmp zstream_b64decode does not return a null terminated buffer, but the code assumes that it is. This results in buffer overflows until the next null byte is encountered in the length calculation, with possible false rejections. Since zstream_b64decode puts the size of the buffer into size, we can directly use that instead of calculating the string length. Contributed by T-Labs, Deutsche Telekom Innovation Laboratories Signed-off-by: Jonas Gorski --- src/http/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/http/http.c b/src/http/http.c index fea870a..19d9faf 100644 --- a/src/http/http.c +++ b/src/http/http.c @@ -454,8 +454,8 @@ http_new_client(struct uloop_fd *ufd, unsigned events) } snprintf(auth_basic_check, (len + 1), "%s:%s\0", username, password); - if (strlen(acs_auth_basic) == strlen(auth_basic_check)) { - len = strlen(acs_auth_basic); + if (size == strlen(auth_basic_check)) { + len = size; } else { auth_status = 0; goto free_resources; -- 1.7.10