gmane.comp.embedded.openwrt.devel

[PATCH] Bump dnsmasq to 2.61

Adam Gensler — 2012-05-26T05:16:56

All,

I've bumped dnsmasq to version 2.61. From my analysis, the 
101-ipv6.patch is no longer required. I believe this was simplifying the 
config/build process to make sure IPv6 support was enabled correctly. 
The associate file, /src/config.h has been cleaned up in the newest 
version and it seems to work just fine without this patch. I tested two 
ways.

1. Without IPv6 enabled in menuconfig, specifically I disabled 
CONFIG_IPV6. When I did that and ran dnsmasq compiled with that flag 
disabled, it fired up without IPv6 support:

May 26 01:06:22 alix daemon.info dnsmasq[18416]: started, version 2.61 
cachesize 150
May 26 01:06:22 alix daemon.info dnsmasq[18416]: compile time options: 
no-IPv6 GNU-getopt no-DBus no-i18n no-IDN DHCP no-DHCPv6 no-Lua TFTP 
no-conntrack
May 26 01:06:22 alix daemon.info dnsmasq-dhcp[18416]: DHCP, IP range 
172.28.1.220 -- 172.28.1.249, lease time 8h
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using local addresses 
only for domain lan
May 26 01:06:22 alix daemon.info dnsmasq[18416]: reading 
/tmp/resolv.conf.auto
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using nameserver 
24.25.5.60#53
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using nameserver 
24.25.5.61#53
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using local addresses 
only for domain lan
May 26 01:06:22 alix daemon.info dnsmasq[18416]: read /etc/hosts - 1 
addresses

2. Then I cleaned the package, enabled CONFIG_IPV6, recompiled and ran 
it again, this time it launches with IPv6 support:

May 26 01:07:39 alix daemon.info dnsmasq[18860]: started, version 2.61 
cachesize 150
May 26 01:07:39 alix daemon.info dnsmasq[18860]: compile time options: 
IPv6 GNU-getopt no-DBus no-i18n no-IDN DHCP DHCPv6 no-Lua TFTP no-conntrack
May 26 01:07:39 alix daemon.info dnsmasq-dhcp[18860]: DHCP, IP range 
172.28.1.220 -- 172.28.1.249, lease time 8h
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using local addresses 
only for domain lan
May 26 01:07:39 alix daemon.info dnsmasq[18860]: reading 
/tmp/resolv.conf.auto
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using nameserver 
24.25.5.60#53
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using nameserver 
24.25.5.61#53
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using local addresses 
only for domain lan
May 26 01:07:39 alix daemon.info dnsmasq[18860]: read /etc/hosts - 1 
addresses

Any input and/or suggestions are welcome. Note, this version of dnsmasq 
has some DHCPv6 support, however, the dnsmasq.init file has not been 
updated to support it via UCI.

Signed-off-by: Adam Gensler <openwrt< at >kristenandadam.net>
---
Index: package/dnsmasq/patches/101-ipv6.patch
===================================================================
--- package/dnsmasq/patches/101-ipv6.patch(revision 31858)
+++ package/dnsmasq/patches/101-ipv6.patch(working copy)
< at >< at > -1,13 +0,0 < at >< at >
---- a/src/config.h
-+++ b/src/config.h
-< at >< at > -263,8 +263,9 < at >< at > NOTES:
- /* We assume that systems which don't have IPv6
-    headers don't have ntop and pton either */
- 
--#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
-+#if defined(INET6_ADDRSTRLEN) && !defined(NO_IPV6)
- #  define HAVE_IPV6
-+#  define IPV6_V6ONLY 26
- #  define ADDRSTRLEN INET6_ADDRSTRLEN
- #  if defined(SOL_IPV6)
- #    define IPV6_LEVEL SOL_IPV6
Index: package/dnsmasq/Makefile
===================================================================
--- package/dnsmasq/Makefile(revision 31858)
+++ package/dnsmasq/Makefile(working copy)
< at >< at > -8,12 +8,12 < at >< at >
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.59
-PKG_RELEASE:=4
+PKG_VERSION:=2.61
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6
+PKG_MD5SUM:=6ed0a5c2524dfc3a74ef494ee2469f09
 
 PKG_INSTALL:=1
 
_______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

OpenWRT front page article on blog.snort.org

Robert Vineyard — 2012-05-25T12:39:15

http://blog.snort.org/2012/05/daemonlogger-native-package-now-in.html

A humble post on my own lowly blog has found its way to a much larger 
audience: the Snort community.

Big thanks to Philip Prindeville and Outback Dingo for helping me put 
this together. I really appreciate your patience and advice.

I'm trying to bring sexy back to network security monitoring with 
OpenWRT :-)

Cheers,
Robert Vineyard

What is CeroWrt? (was: Not quite getting IPv6tunnel to work)

Rich Brown — 2012-05-25T11:57:06

CeroWrt is a platform for experimenting with solutions to the problem,
"Daddy, why is the Internet slow today?" CeroWrt has implemented the new
CoDel ("Controlling Delay") algorithm for fair queueing and reducing the
amount of data buffered by the router. From the Overview page at
http://www.bufferbloat.net/projects/cerowrt

---
CeroWrt is a project built on the OpenWrt firmware to resolve the endemic
problems of bufferbloat in home networking today, and to push forward the
state of the art of edge networks and routers. Projects include proper IPv6
support, tighter integration with DNSSEC, and most importantly, reducing
bufferbloat in both the wired and wireless components of the stack.
---

With CoDel (pronounced "coddle"), we're seeing good responsiveness of small
packet traffic through the CeroWrt routers even when doing heavy file
transfers. So you don't hose your gaming/VoIP traffic if somebody else
uploads or downloads files.

Dave Täht has done the lion's share of the work to get this going, and has
been actively pushing the changes back into the OpenWrt trunk so that
others can benefit from these changes. You can read more at:

Bufferbloat Overview: http://www.bufferbloat.net/
CeroWrt Wiki: http://www.bufferbloat.net/projects/cerowrt/wiki
CoDel article: http://queue.acm.org/detail.cfm?id=2209336

Best regards,

Rich Brown
Hanover, NH USA
_______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Huawei E1752 built-in microSD card reader

Daniel A. Nagy — 2012-05-25T11:53:59

Hello,

I am not exactly sure which driver acts up, but the following strange
thing happens with this device:
Initially (which means both after power-on and reboot with the E1752
already plugged in as well as after hot-plugging in the E1752), only
/dev/sda appears in the device directory. However, if I access the block
device (e.g. by head -c16 /dev/sda or similar commands reading from it),
the partitions (/dev/sda1, etc.) also appear and mountd mounts them, if
properly configured.

This does not happen with USB pen drives or HDD enclosures.

Any ideas what might be going on?

P. S.: the modem itself works perfectly.

[PATCH] upgrade and improve uboot-env package

Luka Perkov — 2012-05-24T23:22:01

Changes in this patch:

 * bumps to version 2012.04.01
 * adds md5sum
 * creates a menu so it will look better in "make menuconfig"
 * adds /etc/fw_env.config to conffile
 * adds /etc/config/ubootenv to conffile
 * refresh patches
 * removes init script because we should be using uci-defaults instead
 * supports all current targets using this package - ar71xx and lantiq

Signed-off-by: Luka Perkov <openwrt< at >lukaperkov.net>
---

 package/uboot-envtools/Makefile                    |   54 ++++++++++++++------
 package/uboot-envtools/files/ar71xx                |   25 +++++++++
 package/uboot-envtools/files/lantiq                |   25 +++++++++
 package/uboot-envtools/files/uboot-envtools.init   |   27 ----------
 package/uboot-envtools/files/uboot-envtools.sh     |   36 +++++++++++++
 .../patches/001-crc32_func_signature.patch         |   17 ++----
 package/uboot-envtools/patches/002-makefile.patch  |   39 +++++++-------
 .../uboot-envtools/patches/003-nor-eraselen.patch  |    2 +-
 .../patches/004-allow_mac_change.patch             |   21 ++++++++
 .../ar71xx/base-files/etc/uci-defaults/ubootenv    |   37 --------------
 .../base-files/etc/uci-defaults/uboot_environment  |   32 ------------
 11 files changed, 169 insertions(+), 146 deletions(-)

diff --git a/package/uboot-envtools/Makefile b/package/uboot-envtools/Makefile
index adb2aea..45f7430 100644
--- a/package/uboot-envtools/Makefile
+++ b/package/uboot-envtools/Makefile
< at >< at > -1,5 +1,5 < at >< at >
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
< at >< at > -9,12 +9,12 < at >< at > include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
-PKG_VERSION:=2011.06
-PKG_RELEASE:=4
+PKG_VERSION:=2012.04.01
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=
+PKG_MD5SUM:=192bb231082d9159fb6e16de3039b6b2
 PKG_BUILD_DEPENDS:=zlib
 
 include $(INCLUDE_DIR)/package.mk
< at >< at > -26,31 +26,53 < at >< at > define Package/uboot-envtools
   CATEGORY:=Utilities
   TITLE:=read/modify U-Boot bootloader environment
   URL:=http://www.denx.de/wiki/U-Boot
+  MENU:=1
+endef
+
+define Package/uboot-envtools/config
+menu "Configuration"
+depends on PACKAGE_uboot-envtools
+
+config PACKAGE_uboot-envtools_setenv_symlink
+bool "Create fw_setenv symlink"
+default n
+help
+With this option selected you will be able to edit U-Boot bootloader environment.
+ 
+endmenu
 endef
 
 define Package/uboot-envtools/description
  This package includes tools to read and modify U-Boot bootloader environment.
 endef
 
-define Package/uboot-envtools/config
-        config PACKAGE_uboot-envtools_setenv_symlink
-                bool "create fw_setenv symlink"
+define Build/Prepare
+mkdir -p $(PKG_BUILD_DIR)
+tar xvjf $(DL_DIR)/$(PKG_SOURCE) --strip-components=2 -C $(PKG_BUILD_DIR) $(PKG_DISTNAME)-$(PKG_VERSION)/lib/crc32.c
+$(call Build/Prepare/Default)
+endef
+
+define Package/uboot-envtools/conffiles
+/etc/config/ubootenv
+/etc/fw_env.config
 endef
 
 define Package/uboot-envtools/install
 $(INSTALL_DIR) $(1)/usr/sbin
-$(INSTALL_BIN) $(PKG_BUILD_DIR)/fw_printenv $(1)/usr/sbin/
+$(INSTALL_BIN) $(PKG_BUILD_DIR)/fw_printenv $(1)/usr/sbin
 ifneq ($(CONFIG_PACKAGE_uboot-envtools_setenv_symlink),)
 ln -s fw_printenv $(1)/usr/sbin/fw_setenv
 endif
-$(INSTALL_DIR) $(1)/etc/init.d
-$(INSTALL_BIN) ./files/uboot-envtools.init $(1)/etc/init.d/uboot-envtools
-endef
-
-define Build/Prepare
-mkdir -p $(PKG_BUILD_DIR)
-tar xvjf $(DL_DIR)/$(PKG_SOURCE) --strip-components=2 -C $(PKG_BUILD_DIR) $(PKG_DISTNAME)-$(PKG_VERSION)/lib/crc32.c
-$(call Build/Prepare/Default)
+$(INSTALL_DIR) $(1)/lib
+$(INSTALL_DATA) ./files/uboot-envtools.sh $(1)/lib
+ifneq ($(CONFIG_TARGET_ar71xx),)
+$(INSTALL_DIR) $(1)/etc/uci-defaults
+$(INSTALL_BIN) ./files/ar71xx $(1)/etc/uci-defaults/uboot-envtools
+endif
+ifneq ($(CONFIG_TARGET_lantiq),)
+$(INSTALL_DIR) $(1)/etc/uci-defaults
+$(INSTALL_BIN) ./files/lantiq $(1)/etc/uci-defaults/uboot-envtools
+endif
 endef
 
 $(eval $(call BuildPackage,uboot-envtools))
diff --git a/package/uboot-envtools/files/ar71xx b/package/uboot-envtools/files/ar71xx
new file mode 100644
index 0000000..15b6b15
--- /dev/null
+++ b/package/uboot-envtools/files/ar71xx
< at >< at > -0,0 +1,25 < at >< at >
+#!/bin/sh
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+
+[ -e /etc/config/ubootenv ] && exit 0
+
+touch /etc/config/ubootenv
+
+. /lib/ar71xx.sh
+. /lib/uboot-envtools.sh
+. /lib/functions.sh
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+all0258n)
+ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000"
+;;
+esac
+
+config_load ubootenv
+config_foreach ubootenv_add_app_config ubootenv
+
+exit 0
diff --git a/package/uboot-envtools/files/lantiq b/package/uboot-envtools/files/lantiq
new file mode 100644
index 0000000..40befc3
--- /dev/null
+++ b/package/uboot-envtools/files/lantiq
< at >< at > -0,0 +1,25 < at >< at >
+#!/bin/sh
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+
+[ -e /etc/config/ubootenv ] && exit 0
+
+touch /etc/config/ubootenv
+
+. /lib/lantiq.sh
+. /lib/uboot-envtools.sh
+. /lib/functions.sh
+
+board=$(lantiq_board_name)
+
+case "$board" in
+GIGASX76X)
+ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000" "1"
+;;
+esac
+
+config_load ubootenv
+config_foreach ubootenv_add_app_config ubootenv
+
+exit 0
diff --git a/package/uboot-envtools/files/uboot-envtools.init b/package/uboot-envtools/files/uboot-envtools.init
deleted file mode 100755
index 066109b..0000000
--- a/package/uboot-envtools/files/uboot-envtools.init
+++ /dev/null
< at >< at > -1,27 +0,0 < at >< at >
-#!/bin/sh /etc/rc.common
-# (C) 2011 OpenWrt.org
-# Creates /etc/fw_env.conf for fw_printenv (and fw_setenv)
-
-START=80
-
-create_fwenv_config() {
-local dev
-local offset
-local envsize
-local secsize
-local numsec
-config_get dev "$1" dev
-config_get offset "$1" offset "0x0000"
-config_get envsize "$1" envsize
-config_get secsize "$1" secsize
-config_get numsec "$1" numsec
-echo "$dev$offset$envsize$secsize$numsec" >>/etc/fw_env.config
-}
-
-start() {
-[ ! -e /etc/fw_env.config ] && {
-echo "# MTD device nameDevice offsetEnv. sizeFlash sector sizeNumber of sectors" >/etc/fw_env.config
-config_load ubootenv
-config_foreach create_fwenv_config ubootenv
-}
-}
diff --git a/package/uboot-envtools/files/uboot-envtools.sh b/package/uboot-envtools/files/uboot-envtools.sh
new file mode 100644
index 0000000..e21b283
--- /dev/null
+++ b/package/uboot-envtools/files/uboot-envtools.sh
< at >< at > -0,0 +1,36 < at >< at >
+#!/bin/sh
+#
+# Copyright (C) 2011-2012 OpenWrt.org
+#
+
+ubootenv_add_uci_config() {
+local dev=$1
+local offset=$2
+local envsize=$3
+local secsize=$4
+local numsec=$5
+uci batch <<EOF
+add ubootenv ubootenv
+set ubootenv.< at >ubootenv[-1].dev='$dev'
+set ubootenv.< at >ubootenv[-1].offset='$offset'
+set ubootenv.< at >ubootenv[-1].envsize='$envsize'
+set ubootenv.< at >ubootenv[-1].secsize='$secsize'
+set ubootenv.< at >ubootenv[-1].numsec='$numsec'
+EOF
+uci commit ubootenv
+}
+
+ubootenv_add_app_config() {
+local dev
+local offset
+local envsize
+local secsize
+local numsec
+config_get dev "$1" dev
+config_get offset "$1" offset
+config_get envsize "$1" envsize
+config_get secsize "$1" secsize
+config_get numsec "$1" numsec
+echo "$dev $offset $envsize $secsize $numsec" >>/etc/fw_env.config
+}
+
diff --git a/package/uboot-envtools/patches/001-crc32_func_signature.patch b/package/uboot-envtools/patches/001-crc32_func_signature.patch
index da9742f..f68f29e 100644
--- a/package/uboot-envtools/patches/001-crc32_func_signature.patch
+++ b/package/uboot-envtools/patches/001-crc32_func_signature.patch
< at >< at > -84,7 +84,7 < at >< at >
  
  #ifdef MTD_OLD
  # include <stdint.h>
-< at >< at > -210,13 +211,14 < at >< at > static char default_environment[] = {
+< at >< at > -212,13 +213,14 < at >< at > static char default_environment[] = {
  static int flash_io (int mode);
  static char *envmatch (char * s1, char * s2);
  static int parse_config (void);
< at >< at > -101,7 +101,7 < at >< at >
  
  if (HaveRedundEnv)
  rc -= sizeof (char);
-< at >< at > -346,7 +348,7 < at >< at > int fw_env_close(void)
+< at >< at > -348,7 +350,7 < at >< at > int fw_env_close(void)
  /*
   * Update CRC
   */
< at >< at > -110,16 +110,7 < at >< at >
  
  /* write environment back to flash */
  if (flash_io(O_RDWR)) {
-< at >< at > -802,7 +804,7 < at >< at > static int flash_write_buf (int dev, int
- data = malloc (erase_len);
- if (!data) {
- fprintf (stderr,
-- "Cannot malloc %u bytes: %s\n",
-+ "Cannot malloc %zu bytes: %s\n",
-  erase_len, strerror (errno));
- return -1;
- }
-< at >< at > -1107,7 +1109,7 < at >< at > int fw_env_open(void)
+< at >< at > -1116,7 +1118,7 < at >< at > int fw_env_open(void)
  if (flash_io (O_RDONLY))
  return -1;
  
< at >< at > -128,7 +119,7 < at >< at >
  crc0_ok = (crc0 == *environment.crc);
  if (!HaveRedundEnv) {
  if (!crc0_ok) {
-< at >< at > -1151,7 +1153,7 < at >< at > int fw_env_open(void)
+< at >< at > -1160,7 +1162,7 < at >< at > int fw_env_open(void)
  return -1;
  }
  
diff --git a/package/uboot-envtools/patches/002-makefile.patch b/package/uboot-envtools/patches/002-makefile.patch
index ddd08e1..b18bff6 100644
--- a/package/uboot-envtools/patches/002-makefile.patch
+++ b/package/uboot-envtools/patches/002-makefile.patch
< at >< at > -1,13 +1,13 < at >< at >
 --- a/Makefile
 +++ b/Makefile
-< at >< at > -21,37 +21,16 < at >< at >
+< at >< at > -21,34 +21,17 < at >< at >
  # MA 02111-1307 USA
  #
  
 -include $(TOPDIR)/config.mk
 -
--HOSTSRCS := $(obj)crc32.c  fw_env.c  fw_env_main.c
-+SRCS := crc32.c  fw_env.c  fw_env_main.c
+-HOSTSRCS := $(SRCTREE)/lib/crc32.c  fw_env.c  fw_env_main.c
++SRCS := crc32.c fw_env.c fw_env_main.c
  HEADERS:= fw_env.h
  
 -# Compile for a hosted environment on the target
< at >< at > -19,27 +19,26 < at >< at >
 -ifeq ($(MTD_VERSION),old)
 -HOSTCPPFLAGS += -DMTD_OLD
 -endif
-+CPPFLAGS := -Wall $(CFLAGS)
- 
- all:$(obj)fw_printenv
- 
- # Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED
+-
+-all:$(obj)fw_printenv
+-
+-# Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED
 -$(obj)fw_printenv:$(HOSTSRCS) $(HEADERS)
 -$(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $< at > $(HOSTSRCS)
-+$(obj)fw_printenv:$(SRCS) $(HEADERS)
-+$(CC) $(CPPFLAGS) $(SRCS) -o $(obj)fw_printenv
++CPPFLAGS := -Wall $(CFLAGS)
+ 
+-clean:
+-rm -f $(obj)fw_printenv
++all: fw_printenv
  
- clean:
--rm -f $(obj)fw_printenv $(obj)crc32.c
--
--$(obj)crc32.c:
--ln -s $(src)../../lib/crc32.c $(obj)crc32.c
--
 -#########################################################################
--
++fw_printenv: $(SRCS) $(HEADERS)
++$(CC) $(CPPFLAGS) $(SRCS) -o fw_printenv
+ 
 -include $(TOPDIR)/rules.mk
 -
 -sinclude $(obj).depend
--
--#########################################################################
-+rm -f $(obj)fw_printenv
++clean:
++rm -f fw_printenv
+ 
+ #########################################################################
diff --git a/package/uboot-envtools/patches/003-nor-eraselen.patch b/package/uboot-envtools/patches/003-nor-eraselen.patch
index fd10fec..c6eb59a 100644
--- a/package/uboot-envtools/patches/003-nor-eraselen.patch
+++ b/package/uboot-envtools/patches/003-nor-eraselen.patch
< at >< at > -1,6 +1,6 < at >< at >
 --- a/fw_env.c
 +++ b/fw_env.c
-< at >< at > -779,7 +779,10 < at >< at > static int flash_write_buf (int dev, int
+< at >< at > -790,7 +790,10 < at >< at > static int flash_write_buf (int dev, int
  erase_offset = (offset / blocklen) * blocklen;
  
  /* Maximum area we may use */
diff --git a/package/uboot-envtools/patches/004-allow_mac_change.patch b/package/uboot-envtools/patches/004-allow_mac_change.patch
new file mode 100644
index 0000000..b7d600b
--- /dev/null
+++ b/package/uboot-envtools/patches/004-allow_mac_change.patch
< at >< at > -0,0 +1,21 < at >< at >
+--- a/fw_env.c
++++ b/fw_env.c
+< at >< at > -46,8 +46,6 < at >< at >
+ 
+ #include "fw_env.h"
+ 
+-#include <config.h>
+-
+ #define WHITESPACE(c) ((c == '\t') || (c == ' '))
+ 
+ #define min(x, y) ({\
+< at >< at > -401,9 +399,7 < at >< at > int fw_env_write(char *name, char *value
+ if (
+     (strcmp(name, "serial#") == 0) ||
+     ((strcmp(name, "ethaddr") == 0)
+-#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
+     && (strcmp(oldval, MK_STR(CONFIG_ETHADDR)) != 0)
+-#endif /* CONFIG_OVERWRITE_ETHADDR_ONCE && CONFIG_ETHADDR */
+    ) ) {
+ fprintf (stderr, "Can't overwrite \"%s\"\n", name);
+ errno = EROFS;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/ubootenv b/target/linux/ar71xx/base-files/etc/uci-defaults/ubootenv
deleted file mode 100755
index 687f340..0000000
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/ubootenv
+++ /dev/null
< at >< at > -1,37 +0,0 < at >< at >
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-add_ubootenv() {
-local dev=$1
-local offset=$2
-local envsize=$3
-local secsize=$4
-local numsec=$5
-uci batch <<EOF
-add ubootenv ubootenv
-set ubootenv.< at >ubootenv[-1].dev='$dev'
-set ubootenv.< at >ubootenv[-1].offset='$offset'
-set ubootenv.< at >ubootenv[-1].envsize='$envsize'
-set ubootenv.< at >ubootenv[-1].secsize='$secsize'
-set ubootenv.< at >ubootenv[-1].numsec='$numsec'
-EOF
-}
-
-[ -e /etc/config/ubootenv ] && exit 0
-
-touch /etc/config/ubootenv
-
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
-
-case "$board" in
-all0258n)
-add_ubootenv /dev/mtd1 0x0 0x10000 0x10000
-;;
-
-esac
-
-uci commit ubootenv
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/uboot_environment b/target/linux/lantiq/base-files/etc/uci-defaults/uboot_environment
deleted file mode 100644
index 58a78df..0000000
--- a/target/linux/lantiq/base-files/etc/uci-defaults/uboot_environment
+++ /dev/null
< at >< at > -1,32 +0,0 < at >< at >
-#!/bin/sh
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-
-uboot_environment_configuration() {
-local dev=$1
-local offset=$2
-local envsize=$3
-local secsize=$4
-local numsec=$5
-echo "$dev $offset $envsize $secsize $numsec" > /etc/fw_env.config
-}
-
-[ -e /etc/config/fw_env.config ] && exit 0
-
-. /lib/lantiq.sh
-
-board=$(lantiq_board_name)
-
-case "$board" in
-GIGASX76X)
-uboot_environment_configuration "/dev/mtd1" "0x0" "0x10000" "0x10000" "1"
-;;
-
-*)
-# custom foo goes here
-true
-;;
-esac
-
-exit 0

Bricked WR1043ND

Michael Markstaller — 2012-05-24T22:08:07

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

first, dont worry its *not* about asking how to unbrick ;) This is
well documented in the wiki and working fine with serial and tftp..

I rather want to understand, what went wrong (or if it's maybe a
problem that others might run into and avoid it even if its only by
telling about..)


What I did:
- - full buildoot checked out from trunk, long and last working fine
with r31676.
The inital checkout was under Ubuntu 10.04 or 10.10, now running
12.04/32bit (if that matters)
Didnt change anything (significant) anywhere under target or such,
only some small adjustments in feeds/packages and an own feed only
providing userland-stuff..
- - did "svn up" today, only in trunk, not packages (if it matters) ->
r31845
- - make menuconfig, nothing changed besides "Release version number"
and remove some <M>-packages
- - make -j 8, the i7 worked for some hours, all looked fine
- - flashed
openwrt-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin like
many times before through LuCI

and then:
- --- cut ---
U-Boot 1.1.4 (Nov 17 2009 - 11:56:26)

AP83 (ar9100) U-boot 0.0.11
DRAM:
sri
32 MB
id read 0x100000ff
flash size 8MB, sector count = 128
Flash:  8 MB
Using default environment

In:    serial
Out:   serial
Err:   serial
Net:   ag7100_enet_initialize...
No valid address in Flash. Using fixed address
: cfg1 0xf cfg2 0x7114
eth0: 00:03:7f:09:0b:ad
eth0 up
eth0
Autobooting in 1 seconds## Booting image at bf020000 ...
   Uncompressing Kernel Image ... OK

Starting kernel ...



OpenWrt kernel loader for AR7XXX/AR9XXX
Copyright (C) 2011 Gabor Juhos <juhosg< at >openwrt.org>
Looking for OpenWrt image... found at 0xbf022000
Decompressing kernel... done!
Starting kernel at 80060000...

[    0.000000] Linux version 3.3.7 (markstaller< at >v3750mm) (gcc version
4.6.3 20120201 (prerelease) (Linaro GCC 4.6-2012.02) ) #1 Thu May 24
19:33:25 CEST 2012
[    0.000000] bootconsole [early0] enabled
[    0.000000] CPU revision is: 00019374 (MIPS 24Kc)
[    0.000000] SoC: Atheros AR9132 rev 2
[    0.000000] Clocks: CPU:400.000MHz, DDR:400.000MHz, AHB:200.000MHz,
Ref:5.000MHz
[    0.000000] Determined physical RAM map:
[    0.000000]  memory: 02000000 < at > 00000000 (usable)
[    0.000000] Initrd not found or empty - disabling initrd
[    0.000000] Zone PFN ranges:
[    0.000000]   Normal   0x00000000 -> 0x00002000
[    0.000000] Movable zone start PFN for each node
[    0.000000] Early memory PFN ranges
[    0.000000]     0: 0x00000000 -> 0x00002000
[    0.000000] Built 1 zonelists in Zone order, mobility grouping on.
 Total pages: 8128
[    0.000000] Kernel command line:  board=TL-WR1043ND
console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd
[    0.000000] PID hash table entries: 128 (order: -3, 512 bytes)
[    0.000000] Dentry cache hash table entries: 4096 (order: 2, 16384
bytes)
[    0.000000] Inode-cache hash table entries: 2048 (order: 1, 8192 bytes)
[    0.000000] Primary instruction cache 64kB, VIPT, 4-way, linesize
32 bytes.
[    0.000000] Primary data cache 32kB, 4-way, VIPT, cache aliases,
linesize 32 bytes
[    0.000000] Writing ErrCtl register=00000000
[    0.000000] Readback ErrCtl register=00000000
[    0.000000] Memory: 29304k/32768k available (2122k kernel code,
3464k reserved, 366k data, 168k init, 0k highmem)
[    0.000000] SLUB: Genslabs=9, HWalign=32, Order=0-3, MinObjects=0,
CPUs=1, Nodes=1
[    0.000000] NR_IRQS:48
[    0.000000] Calibrating delay loop... 265.42 BogoMIPS (lpj=1327104)
[    0.080000] pid_max: default: 32768 minimum: 301
[    0.080000] Mount-cache hash table entries: 512
[    0.090000] NET: Registered protocol family 16
[    0.090000] gpiochip_add: registered GPIOs 0 to 21 on device: ath79
[    0.100000] MIPS: machine is Generic AR71XX/AR724X/AR913X based board
[    0.110000] bio: create slab <bio-0> at 0
[    0.110000] Switching to clocksource MIPS
[    0.120000] NET: Registered protocol family 2
[    0.120000] IP route cache hash table entries: 1024 (order: 0, 4096
bytes)
[    0.130000] TCP established hash table entries: 1024 (order: 1,
8192 bytes)
[    0.140000] TCP bind hash table entries: 1024 (order: 0, 4096 bytes)
[    0.140000] TCP: Hash tables configured (established 1024 bind 1024)
[    0.150000] TCP reno registered
[    0.150000] UDP hash table entries: 256 (order: 0, 4096 bytes)
[    0.160000] UDP-Lite hash table entries: 256 (order: 0, 4096 bytes)
[    0.160000] NET: Registered protocol family 1
[    0.190000] squashfs: version 4.0 (2009/01/31) Phillip Lougher
[    0.190000] JFFS2 version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME)
(CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc.
[    0.200000] msgmni has been set to 57
[    0.210000] io scheduler noop registered
[    0.210000] io scheduler deadline registered (default)
[    0.220000] Serial: 8250/16550 driver, 1 ports, IRQ sharing disabled
[    0.240000] serial8250.0: ttyS0 at MMIO 0x18020000 (irq = 11) is a
16550A
[    0.250000] console [ttyS0] enabled, bootconsole disabled
[    0.250000] console [ttyS0] enabled, bootconsole disabled
[    0.270000] TCP westwood registered
[    0.270000] NET: Registered protocol family 17
[    0.280000] Bridge firewalling registered
[    0.280000] 8021q: 802.1Q VLAN Support v1.8
[    0.290000] VFS: Cannot open root device "(null)" or unknown-block(0,0)
[    0.290000] Please append a correct "root=" boot option; here are
the available partitions:
[    0.300000] Kernel panic - not syncing: VFS: Unable to mount root
fs on unknown-block(0,0)

- --- cut ---

Whats missing compared to my last image:
- --- cut ---
...
[    0.490000] console [ttyS0] enabled, bootconsole disabled
[    0.500000] Atheros AR71xx SPI Controller driver version 0.2.4
[    0.510000] m25p80 spi0.0: found s25sl064a, expected m25p80
[    0.510000] m25p80 spi0.0: s25sl064a (8192 Kbytes)
[    0.520000] 5 tp-link partitions found on MTD device spi0.0
[    0.520000] Creating 5 MTD partitions on "spi0.0":
...
- --- cut ---


- -> If its just my buildroot trashed, well, i'll check out fresh and
rebuild but if it's worth any further investigation let me know..

I'd also just want to understand why this happened and whats exactly
missing to avoid it in future.. Not 110% sure, but 99% I didnt fiddle
anywhere besides userland feeds/packages or smthg..

tia,

Michael
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk++sUcACgkQaWRHV2kMuAL/nwCfTm645r+BWs0RKPBydxfOih06
EcoAoJT7HDbOOSzkeM09ZVpEJtzR9fi6
=ZVtO
-----END PGP SIGNATURE-----

[PATCH] include/image.mk: /tmp should have mode 1777

Mark Mentovai — 2012-05-24T21:37:21

On the off chance that the root filesystem's /tmp is used directly as a
temporary directory instead of having a tmpfs mounted over it, it should have
the sticky bit set.

Signed-off-by: Mark Mentovai <mark< at >moxienet.com>

---

Index: include/image.mk
===================================================================
--- include/image.mk(revision 31782)
+++ include/image.mk(working copy)
< at >< at > -146,7 +146,7 < at >< at >
 - $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
 - $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
 $(INSTALL_DIR) $(TARGET_DIR)/tmp
-chmod 0777 $(TARGET_DIR)/tmp
+chmod 1777 $(TARGET_DIR)/tmp
 endef
 
 define Image/mkfs/prepare

[PATCH] base-files: /etc/shadow should have mode0600

Mark Mentovai — 2012-05-24T21:30:23

Shadow passwords were enabled by default in r28936, but most of the benefit
was not realized because the shadow file was allowed to be world-readable.
This change sets /etc/shadow's mode to 0600 in the base-files package, and
ensures that its permissions are not clobbered when building an image.

Signed-off-by: Mark Mentovai <mark< at >moxienet.com>

---

Index: include/image.mk
===================================================================
--- include/image.mk(revision 31782)
+++ include/image.mk(working copy)
< at >< at > -142,7 +142,7 < at >< at >
 
 define Image/mkfs/prepare/default
 # Use symbolic permissions to avoid clobbering SUID/SGID/sticky bits
-- $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r
+- $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -not -name shadow -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r
 - $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
 - $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
 $(INSTALL_DIR) $(TARGET_DIR)/tmp
Index: package/base-files/Makefile
===================================================================
--- package/base-files/Makefile(revision 31782)
+++ package/base-files/Makefile(working copy)
< at >< at > -453,6 +453,7 < at >< at >
 # from /etc/passwd, and adding on pw change data
 cut -d ':' -f 1-2 $(1)/etc/passwd > $(1)/etc/shadow; \
 $(SED) 's/$$$$/:0:0:99999:7:::/' $(1)/etc/shadow
+chmod 0600 $(1)/etc/shadow
 
 $(VERSION_SED) \
 $(1)/etc/banner \

[PATCH] package/openssh enable ECDSA (see also:patch for package/openssl to enable ECDSA)

Oliver — 2012-05-24T20:36:50

The following patch enables generation of ecdsa keys in OpenSSH at init.

Signed-off-by: Oliver Smith <olipro< at >8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>_______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] package/openssl enable ECDSA (see also:patch for package/openssh to enable ECDSA)

Oliver — 2012-05-24T20:34:31

The following patch enables ECDSA support in OpenSSL in order to allow 
OpenSSH to also make use of it as it is now the primary (preferred) mode of 
authentication for OpenSSH

Signed-off-by: Oliver Smith <olipro< at >8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>_______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] update iptables to 1.4.13 and add supportfor -m rpfilter

Oliver — 2012-05-24T20:12:46

The attached patch bumps iptables up to 1.4.13 and adds in support for -m 
rpfilter (reverse path filtering for both IPv4 and IPv6) implemented since 
kernel 3.3

This update breaks compatibility with the 2.4 series, if anyone wishes to 
fix it, feel free.

Tested and working on my WNDR3800 - if you use any xtables-addons 
extensions, ensure you clean out the build dir for it.

Signed-off-by: Oliver Smith <olipro< at >8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>_______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

CyaSSL 2.2.0 Released

Chris Conlon — 2012-05-24T17:56:27

Hi,

We wanted to let the OpenWrt community know that version 2.2.0 of the CyaSSL embedded SSL library has been released and is now available for download from the yaSSL website.  CyaSSL currently supports the OpenWrt project.  This release contains bug fixes and feature enhancements, some of which include:

- Initial CRL (Certificate Revocation Lists) support with --enable-crl
- Initial OCSP (Online Certificate Status Protocol) support with --enable-ocsp
- Static ECDH suites including:
TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
TLS_ECDH_RSA_WITH_RC4_128_SHA
TLS_ECDH_ECDSA_WITH_RC4_128_SHA
TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
- SHA-384 support
- ECC client certificate support

CyaSSL can be downloaded with the open source, GPLv2-license at the yaSSL Download Page (http://yassl.com/yaSSL/download/downloadForm.php).  Please let us know if you have any questions or comments at info< at >yassl.com.

Thanks,
Chris_______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] package/dnsmasq: remove obsolete/etc/dnsmasq.conf

Mark Mentovai — 2012-05-24T16:36:30

Since r31182, dnsmasq is configured by a configuration file at
/var/etc/dnsmasq.conf generated by dnsmasq's start script from its UCI
configuration. It is no longer configured by command-line arguments. dnsmasq
is started by telling it (via the -C option) to use /var/etc/dnsmasq.conf as
its configuration file. As such, it never consults /etc/dnsmasq.conf.

/etc/dnsmasq.conf was added in r17663 when dnsmasq was still configured by
command-line arguments as an example file and location to place options too
cumbersome to put on the command line. Because this file will no longer be
consulted, it is obsolete and should be removed from the dnsmasq package.

Signed-off-by: Mark Mentovai <mark< at >moxienet.com>

---

Index: package/dnsmasq/Makefile
===================================================================
--- package/dnsmasq/Makefile(revision 31782)
+++ package/dnsmasq/Makefile(working copy)
< at >< at > -32,7 +32,6 < at >< at >
 
 define Package/dnsmasq/conffiles
 /etc/config/dhcp
-/etc/dnsmasq.conf
 endef
 
 TARGET_CFLAGS += \
< at >< at > -50,7 +49,6 < at >< at >
 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnsmasq $(1)/usr/sbin/
 $(INSTALL_DIR) $(1)/etc/config
 $(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp
-$(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
 $(INSTALL_DIR) $(1)/etc/init.d
 $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
 endef
Index: package/dnsmasq/files/dnsmasq.conf
===================================================================
--- package/dnsmasq/files/dnsmasq.conf(revision 31782)
+++ package/dnsmasq/files/dnsmasq.conf(working copy)
< at >< at > -1,37 +0,0 < at >< at >
-# Change the following lines if you want dnsmasq to serve SRV
-# records.
-# You may add multiple srv-host lines.
-# The fields are <name>,<target>,<port>,<priority>,<weight>
-
-# A SRV record sending LDAP for the example.com domain to
-# ldapserver.example.com port 289
-#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389
-
-# Two SRV records for LDAP, each with different priorities
-#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1
-#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2
-
-# A SRV record indicating that there is no LDAP server for the domain
-# example.com
-#srv-host=_ldap._tcp.example.com
-
-# The following line shows how to make dnsmasq serve an arbitrary PTR
-# record. This is useful for DNS-SD.
-# The fields are <name>,<target>
-#ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services"
-
-# Change the following lines to enable dnsmasq to serve TXT records.
-# These are used for things like SPF and zeroconf.
-# The fields are <name>,<text>,<text>...
-
-#Example SPF.
-#txt-record=example.com,"v=spf1 a -all"
-
-#Example zeroconf
-#txt-record=_http._tcp.example.com,name=value,paper=A4
-
-# Provide an alias for a "local" DNS name. Note that this _only_ works
-# for targets which are names from DHCP or /etc/hosts. Give host
-# "bert" another name, bertrand
-# The fields are <cname>,<target>
-#cname=bertand,bert

[PATCH 4/4] package/dnsmasq: allow inhibition of "search" line in resolv.conf

Mark Mentovai — 2012-05-24T16:11:24

When dnsmasq is configured with a "domain" option in the "config dnsmasq"
section of /etc/config/dhcp, it causes a "search" line to be added to
/etc/resolv.conf naming the domain specified. For situations where this is
undesirable, this can now be bypassed with the "search_domain" boolean option.
The default, on, produces the current behavior. Setting it to off avoids
adding a "search" line to resolv.conf. "option domain" still retains its other
functions such as providing the value for the --domain option to dnsmasq.

Signed-off-by: Mark Mentovai <mark< at >moxienet.com>

Index: package/dnsmasq/files/dnsmasq.init
===================================================================
--- package/dnsmasq/files/dnsmasq.init(revision 31782)
+++ package/dnsmasq/files/dnsmasq.init(working copy)
< at >< at > -7,6 +7,7 < at >< at >
 
 DNS_SERVERS=""
 DOMAIN=""
+SEARCH_DOMAIN=1
 INSERT_LANADDR=1
 
 CONFIGFILE="/var/etc/dnsmasq.conf"
< at >< at > -110,6 +111,7 < at >< at >
 append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
 
 config_get DOMAIN "$cfg" domain
+config_get_bool SEARCH_DOMAIN "$cfg" search_domain 1
 config_get_bool INSERT_LANADDR "$cfg" insert_lanaddr 1
 
 config_get_bool readethers "$cfg" readethers
< at >< at > -460,7 +462,8 < at >< at >
 
 service_start /usr/sbin/dnsmasq -C $CONFIGFILE && {
 rm -f /tmp/resolv.conf
-[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf
+[ "$SEARCH_DOMAIN" -ne 0 ] && [ -n "$DOMAIN" ] &&
+echo "search $DOMAIN" >> /tmp/resolv.conf
 DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
 for DNS_SERVER in $DNS_SERVERS ; do
 echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf

[PATCH 3/4] package/dnsmasq: allow inhibition of hostname-to-LAN address mapping

Mark Mentovai — 2012-05-24T16:10:47

r29375 added a feature that provides A and PTR records mapping between the
device's own hostname (uci get system.< at >system[0].hostname) and LAN IP address
(uci get network.lan.ipaddr). For situations where this is undesirable,
the new "insert_lanaddr" option in the "config dnsmasq" section of
/etc/config/dhcp can be used. The default is on, producing the current
behavior. Setting it to off prevents this automatic mapping from being
inserted into the dnsmasq configuration.

Signed-off-by: Mark Mentovai <mark< at >moxienet.com>

Index: package/dnsmasq/files/dnsmasq.init
===================================================================
--- package/dnsmasq/files/dnsmasq.init(revision 31782)
+++ package/dnsmasq/files/dnsmasq.init(working copy)
< at >< at > -7,6 +7,7 < at >< at >
 
 DNS_SERVERS=""
 DOMAIN=""
+INSERT_LANADDR=1
 
 CONFIGFILE="/var/etc/dnsmasq.conf"
 
< at >< at > -109,6 +110,7 < at >< at >
 append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
 
 config_get DOMAIN "$cfg" domain
+config_get_bool INSERT_LANADDR "$cfg" insert_lanaddr 1
 
 config_get_bool readethers "$cfg" readethers
 [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
< at >< at > -451,7 +453,7 < at >< at >
 echo >> $CONFIGFILE
 
 # add own hostname
-[ -z "$lanaddr" ] || {
+[ "$INSERT_LANADDR" -ne 0 ] && [ -n "$lanaddr" ] && {
 local hostname="$(uci_get system.< at >system[0].hostname)"
 dhcp_domain_add "" "${hostname:-OpenWrt}" "$lanaddr"
 }

[PATCH 2/4] package/dnsmasq: permit UCI configuration of --dhcp-fqdn option

Mark Mentovai — 2012-05-24T16:10:12

This adds a new boolean option, fqdn, to the "config dnsmasq" section of
/etc/config/dhcp. The default is off. When set on, it enables the dhcp-fqdn
option to dnsmasq. dhcp-fqdn causes dnsmasq's DNS server to not resolve
unqualifed local hostnames. The "domain" option is required when using "fqdn".
Local hostnames will remain available for lookup using fully-qualified names.

Signed-off-by: Mark Mentovai <mark< at >moxienet.com>

Index: package/dnsmasq/files/dnsmasq.init
===================================================================
--- package/dnsmasq/files/dnsmasq.init(revision 31782)
+++ package/dnsmasq/files/dnsmasq.init(working copy)
< at >< at > -88,6 +88,7 < at >< at >
 append_bool "$cfg" expandhosts "--expand-hosts"
 append_bool "$cfg" enable_tftp "--enable-tftp"
 append_bool "$cfg" nonwildcard "--bind-interfaces"
+append_bool "$cfg" fqdn "--dhcp-fqdn"
 
 append_parm "$cfg" dhcpscript "--dhcp-script"
 append_parm "$cfg" cachesize "--cache-size"

[PATCH 1/4] package/dnsmasq: permit dhcp_option in global dnsmasq config section

Mark Mentovai — 2012-05-24T16:09:32

dnsmasq currently permits dhcp_options to be specified only in "config dhcp"
sections of /etc/config/dhcp. When dnsmasq is providing DHCP service for
multiple subnets and there are multiple "config dhcp" sections without "option
ignore", it makes sense to allow dhcp_options that should apply globally in
the "config dnsmasq" section of /etc/config/dhcp. dhcp_option is a list option.

Signed-off-by: Mark Mentovai <mark< at >moxienet.com>

Index: package/dnsmasq/files/dnsmasq.init
===================================================================
--- package/dnsmasq/files/dnsmasq.init(revision 31782)
+++ package/dnsmasq/files/dnsmasq.init(working copy)
< at >< at > -143,6 +143,8 < at >< at >
 config_list_foreach "$cfg" rebind_domain append_rebind_domain
 }
 
+dhcp_option_add "$cfg" ""
+
 echo >> $CONFIGFILE
 }
 
< at >< at > -325,9 +327,12 < at >< at >
 local cfg="$1"
 local networkid="$2"
 
+local networkid_comma
+[ -n "$networkid" ] && networkid_comma="$networkid",
+
 config_get dhcp_option "$cfg" dhcp_option
 for o in $dhcp_option; do
-xappend "--dhcp-option=$networkid","$o"
+xappend "--dhcp-option=$networkid_comma$o"
 done
 
 }

Not quite getting IPv6 tunnel to work

Rich Brown — 2012-05-24T10:24:29

Folks,

I've read through the docs and forums on the OpenWrt site, and haven't
found a good answer. I'm using a new/clean install of CeroWrt 3.3.6-2 on a
WNDR3700v2, which I believe should work exactly the same as OpenWrt.

I am having trouble making my Hurricane Electric 6in4 tunnel work with
CeroWrt. I have created the script below that uses the suggested
configurations from tunnelbroker.net to set up the tunnel. (This is
substantially the same script as posted to:
http://www.bufferbloat.net/projects/cerowrt/wiki/IPv6_Tunnel ) Here's what
I see:

a) The script below uses the tunnel's Client IPv6 /64 address, and does
establish the tunnel. If I ssh to the router, I can ping ipv6 hosts from
the router, traceroute to ipv6 addresses, etc. However, my MacBook on sw10,
for example, does not get a global IPv6 address.

b) I also used tunnelbroker.net to obtain a routed /48 address. I use the
LuCI GUI to set an IPv6 address for the interface from that /48 subnet. For
example, if the routed /48 is 2001:470:ABCD::/48, I have assigned the  IPv6
address of sw10 (one of the wireless interfaces) to 2001:470:ABCD:902::/64.
My Macbook gets the global address
2001:0470:ABCD:0902:0221:e9ff:fee3:d4b0/64, and I can ping IPv6 addresses.
But...

c) I cannot reliably connect to certain hosts, even IPv4 hosts such as
tunnelbroker.net. When I traceroute6 from my Macbook, I get:

% traceroute6 ipv6.google.com
traceroute6 to ipv6.l.google.com (2607:f8b0:4004:803::1010) from
2001:470:ABCD:902:221:e9ff:fee3:d4b0, 64 hops max, 12 byte packets
1  2001:470:ABCD:902::  4.622 ms  108.652 ms *
2  2001:470:ABCD:902::  2.704 ms  6.961 ms  17.329 ms
%

What am I missing? If I can get some help here, I'll write this up and post
it to the CeroWrt wiki. Many thanks!

Rich Brown
Hanover, NH USA

--------------- Cut Here --------------
#!/bin/sh
# Script for setting CeroWrt (and OpenWrt) to create an IPv6 tunnel
# to Hurricane Electric at http://www.tunnelbroker.net/
# There are two steps:
# 1) Go to the Tunnelbroker.net site to set up your free account
# 2) Run the script below, using the parameters supplied by Tunnelbroker
# This CeroWrt page gives detailed instructions for setting up an IPv6
tunnel:
#    http://www.bufferbloat.net/projects/cerowrt/wiki/IPv6_Tunnel
#
# Once you've created your account and a tunnel, get the "Example
# Configurations" for OpenWRT Backfire, and paste them into this file
# named "tunnel.sh" Finally, ssh into the router and execute this script
# using these steps:
#
# ssh root< at >172.30.42.1
# cd /tmp
# cat > tunnel.sh
# [paste in the contents of this file, then hit ^D]
# sh tunnel.sh
#
# Presto! Your tunnel is set up. You should now be able
#   communicate directly with IPv6 devices.

# ==============================================
# Download and update all the interesting packages
# Some of these are pre-installed, but there is no
# harm in updating/installing them a second time.
opkg update
opkg install 6in4

# ==============================================
# Set the credentials for the tunnel login
# NB: These lines are automatically generated
# specifically for *your* tunnel when you set it up
# Copy/paste them from the Example Configurations
# generated for the OpenWRT Backfire 10.03.1 dropdown
#
# ------- PASTE YOUR EXAMPLE CONFIGURATION LINES HERE --------
uci set network.henet=interface
uci set network.henet.proto=6in4
uci set network.henet.peeraddr=1.2.3.4
uci set network.henet.ip6addr='auto-generated IPv6'
uci set network.henet.tunnelid=TUNNELID
uci set network.henet.username=tb4###############
uci set network.henet.password='plaintext-password'
uci commit network

uci set firewall.< at >zone[1].network='wan henet'
uci commit firewall

ifup henet
/etc/init.d/firewall restart
# ------- END OF EXAMPLE CONFIGURATION LINES --------

# ==============================================
# Re-establishing the Tunnel
#
# NB: As of April 2012 (CeroWrt 3.3.1-4), the automatic re-establishment
code
# of the 6in4 module appears not to be working. You will need to
re-establish
# the tunnel manually when your external IP address changes.
#
# To re-establish the tunnel, say, because your external IP address changed,
# you can also use the following URL with these parameters. Note that the
# USERNAME and PASSWORD are what you type to log into the Tunnelbroker site.
#
# USERNAME is the Account Name
# PASSWORD is the current password
# TUNNELID is the Tunnel ID
# https://USERNAME:PASSWORD< at >ipv4.tunnelbroker.net/ipv4_end.php?tid=TUNNELID
#
# You can also use a non-HTTPS URL and parameters to re-establish the link.
# This form relies on hashed representations of the credentials since
they're
# not carried on a secure connection. You can get more information about the
# parameters at https://ipv4.tunnelbroker.net/ipv4_end.php
#
# USERID is the "User ID" from the Tunnelbroker site's Main Page
# PWHASH is the MD5 hash of the password
# TUNNELID is the Tunnel ID
#
http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=USERID&pass=PWHASH&tid=TUNNELID
#
# --- end of script ---
_______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

回复： Tp-link has released gpl source code of ar934x,which can not be extracted.

Vince Huang — 2012-05-24T01:49:06

Could anyone extract this seemslike tar.gz?




------------------ 原始邮件 ------------------
发件人: "axishero"<axishero< at >foxmail.com>;
发送时间: 2012年5月23日(星期三) 下午5:09
收件人: "openwrt-devel"<openwrt-devel< at >lists.openwrt.org>; 

主题: [OpenWrt-Devel] Tp-link has released gpl source code of ar934x,which can not be extracted.



http://www.tp-link.com/resources/gpl/ap123_gpl.tar.gz



Like before，the suffix is intentionally not matching the archive, but this time I tried altering to different suffixes result in no effect._______________________________________________
openwrt-devel mailing list
openwrt-devel< at >lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[PATCH] pjsip update to version 1.14.2

Luka Perkov — 2012-05-23T23:53:03

Changes in this patch:

 * update to version 1.14.2
 * merge 0004-Pulse-dialing-support-into-pjsip.patch into 0002-register-tapi.patch
 * refresh patches
 * remove dummy echo foo from Makefile

Signed-off-by: Luka Perkov <openwrt< at >lukaperkov.net>
---

 package/pjsip/Makefile                             |   10 +--
 package/pjsip/patches/0001-configure-fixup.patch   |   25 ++-----
 package/pjsip/patches/0002-register-tapi.patch     |   34 +++------
 ...DEF-pj_status_t-pjsua_add_snd_port-int-id.patch |   76 +++++++-------------
 .../0004-Pulse-dialing-support-into-pjsip.patch    |   34 ---------
 5 files changed, 45 insertions(+), 134 deletions(-)

diff --git a/package/pjsip/Makefile b/package/pjsip/Makefile
index 97a5771..20fb6fa 100644
--- a/package/pjsip/Makefile
+++ b/package/pjsip/Makefile
< at >< at > -1,5 +1,5 < at >< at >
 #
-# Copyright (C) 2010-2011 OpenWrt.org
+# Copyright (C) 2010-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
< at >< at > -8,12 +8,12 < at >< at >
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pjsip
-PKG_VERSION:=1.12
+PKG_VERSION:=1.14.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/
-PKG_MD5SUM:=1db8e5a5dd73b216409b15afa34651a4
+PKG_MD5SUM:=05428502384c16e7abd85f047e6e2f6c
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
< at >< at > -96,9 +96,5 < at >< at > define Build/InstallDev
 $(CP) $(PKG_INSTALL_DIR)/usr/pjsip-$(BUILD_VARIANT) $(1)/usr
 endef
 
-define Package/pjsip-$(BUILD_VARIANT)/install
-echo "foo"
-endef
-
 $(eval $(call BuildPackage,pjsip-oss))
 $(eval $(call BuildPackage,pjsip-ltq-tapi))
diff --git a/package/pjsip/patches/0001-configure-fixup.patch b/package/pjsip/patches/0001-configure-fixup.patch
index 38fcea5..2f8a71f 100644
--- a/package/pjsip/patches/0001-configure-fixup.patch
+++ b/package/pjsip/patches/0001-configure-fixup.patch
< at >< at > -1,15 +1,3 < at >< at >
-From 01108f66fd20dcdbb9fde0dd00924ee4e8c28a7c Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic< at >openwrt.org>
-Date: Sat, 28 Jan 2012 21:41:18 +0100
-Subject: [PATCH 1/3] configure fixup
-
----
- pjproject-1.12/aconfigure.ac                |   13 +++++++++++--
- pjproject-1.12/pjmedia/build/os-auto.mak.in |    9 ++++++++-
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/aconfigure.ac b/aconfigure.ac
-index 84295b5..e34fd32 100644
 --- a/aconfigure.ac
 +++ b/aconfigure.ac
 < at >< at > -48,9 +48,9 < at >< at > if test -z "$CROSS_COMPILE"; then
< at >< at > -24,10 +12,11 < at >< at > index 84295b5..e34fd32 100644
  AC_SUBST(LD)
  if test "$LDOUT" = ""; then LDOUT="-o "; fi
  AC_SUBST(LDOUT)
-< at >< at > -604,6 +604,15 < at >< at > AC_ARG_ENABLE(ext_sound,
+< at >< at > -616,6 +616,15 < at >< at > AC_ARG_ENABLE(ext_sound,
+ AC_MSG_RESULT([Checking if external sound is set... yes])
         fi]
        )
- 
++
 +AC_ARG_ENABLE(ltq_tapi,
 +      AC_HELP_STRING([--enable-ltq-tapi],
 +     [PJMEDIA will use ltq tapi backend]),
< at >< at > -36,12 +25,9 < at >< at > index 84295b5..e34fd32 100644
 +AC_MSG_RESULT([Checking if external sound is set... yes])
 +       fi]
 +      )
-+
+ 
  dnl # Include resampling small filter
  AC_SUBST(ac_no_small_filter)
- AC_ARG_ENABLE(small-filter,
-diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
-index 145f1d5..be38aeb 100644
 --- a/pjmedia/build/os-auto.mak.in
 +++ b/pjmedia/build/os-auto.mak.in
 < at >< at > -125,4 +125,11 < at >< at > ifeq ($(AC_PJMEDIA_SND),external)
< at >< at > -57,6 +43,3 < at >< at > index 145f1d5..be38aeb 100644
 +export PJMEDIA_AUDIODEV_OBJS += tapi_dev.o
 +export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_TAPI_DEVICE=1
 +endif
--- 
-1.7.7.1
-
diff --git a/package/pjsip/patches/0002-register-tapi.patch b/package/pjsip/patches/0002-register-tapi.patch
index 56f50cb..4363bc7 100644
--- a/package/pjsip/patches/0002-register-tapi.patch
+++ b/package/pjsip/patches/0002-register-tapi.patch
< at >< at > -1,19 +1,6 < at >< at >
-From 455f6f2234a36aeeb97d3e05e9cbe3afad147341 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic< at >openwrt.org>
-Date: Sat, 28 Jan 2012 21:43:49 +0100
-Subject: [PATCH 2/3] register tapi
-
----
- .../pjmedia/src/pjmedia-audiodev/audiodev.c        |    7 +
- .../pjmedia/src/pjmedia-audiodev/tapi_dev.c        | 1300 ++++++++++++++++++++
- 2 files changed, 1307 insertions(+), 0 deletions(-)
- create mode 100644 pjproject-1.12/pjmedia/src/pjmedia-audiodev/tapi_dev.c
-
-diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c
-index 3b7e121..82b364c 100644
 --- a/pjmedia/src/pjmedia-audiodev/audiodev.c
 +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c
-< at >< at > -98,6 +98,10 < at >< at > pjmedia_aud_dev_factory* pjmedia_symb_mda_factory(pj_pool_factory *pf);
+< at >< at > -98,6 +98,10 < at >< at > pjmedia_aud_dev_factory* pjmedia_symb_md
  pjmedia_aud_dev_factory* pjmedia_null_audio_factory(pj_pool_factory *pf);
  #endif
  
< at >< at > -24,7 +11,7 < at >< at > index 3b7e121..82b364c 100644
  #define MAX_DRIVERS16
  #define MAX_DEVS64
  
-< at >< at > -409,6 +413,9 < at >< at > PJ_DEF(pj_status_t) pjmedia_aud_subsys_init(pj_pool_factory *pf)
+< at >< at > -409,6 +413,9 < at >< at > PJ_DEF(pj_status_t) pjmedia_aud_subsys_i
  #if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO
      aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_null_audio_factory;
  #endif
< at >< at > -34,12 +21,9 < at >< at > index 3b7e121..82b364c 100644
  
      /* Initialize each factory and build the device ID list */
      for (i=0; i<aud_subsys.drv_cnt; ++i) {
-diff --git a/pjmedia/src/pjmedia-audiodev/tapi_dev.c b/pjmedia/src/pjmedia-audiodev/tapi_dev.c
-new file mode 100644
-index 0000000..2c65a0d
 --- /dev/null
 +++ b/pjmedia/src/pjmedia-audiodev/tapi_dev.c
-< at >< at > -0,0 +1,1300 < at >< at >
+< at >< at > -0,0 +1,1307 < at >< at >
 +/******************************************************************************
 +
 +                               Copyright (c) 2010
< at >< at > -237,7 +221,7 < at >< at > index 0000000..2c65a0d
 +} else if (!stricmp(cid, "kpn_dtmf_fsk")) {
 +tapi_cid_type = IFX_TAPI_CID_STD_KPN_DTMF_FSK;
 +PJ_LOG(3, (THIS_FILE, "using KPN DTMF FSK configuration for TAPI CID"));
-+} 
++}
 +}
 +
 +void tapi_locale_select(char *country)
< at >< at > -875,6 +859,13 < at >< at > index 0000000..2c65a0d
 +if(tapi_digit_callback)
 +tapi_digit_callback(i, tapiEvent.data.dtmf.ascii);
 +break;
++case IFX_TAPI_EVENT_PULSE_DIGIT:
++if(tapi_digit_callback)
++if(tapiEvent.data.pulse.digit == 0xB)
++tapi_digit_callback(i, '0');
++else
++tapi_digit_callback(i, '0' + tapiEvent.data.pulse.digit);
++break;
 +case IFX_TAPI_EVENT_COD_DEC_CHG:
 +case IFX_TAPI_EVENT_TONE_GEN_END:
 +case IFX_TAPI_EVENT_CID_TX_SEQ_END:
< at >< at > -1340,6 +1331,3 < at >< at > index 0000000..2c65a0d
 +}
 +
 +#endif /* PJMEDIA_AUDIO_DEV_HAS_TAPI_DEVICE */
--- 
-1.7.7.1
-
diff --git a/package/pjsip/patches/0003-adds-PJ_DEF-pj_status_t-pjsua_add_snd_port-int-id.patch b/package/pjsip/patches/0003-adds-PJ_DEF-pj_status_t-pjsua_add_snd_port-int-id.patch
index 8e9b604..3331c84 100644
--- a/package/pjsip/patches/0003-adds-PJ_DEF-pj_status_t-pjsua_add_snd_port-int-id.patch
+++ b/package/pjsip/patches/0003-adds-PJ_DEF-pj_status_t-pjsua_add_snd_port-int-id.patch
< at >< at > -1,19 +1,6 < at >< at >
-From 1e0d5dbf8b7714dfd490add0e2b507fd513414f3 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic< at >openwrt.org>
-Date: Fri, 3 Feb 2012 21:45:08 +0100
-Subject: [PATCH 3/3] adds PJ_DEF(pj_status_t) pjsua_add_snd_port(int id)
-
----
- pjproject-1.12/pjsip/include/pjsua-lib/pjsua.h     |    2 +
- .../pjsip/include/pjsua-lib/pjsua_internal.h       |    4 +-
- pjproject-1.12/pjsip/src/pjsua-lib/pjsua_media.c   |   69 ++++++++++++++------
- 3 files changed, 54 insertions(+), 21 deletions(-)
-
-diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
-index 85dbbbb..ad3e020 100644
 --- a/pjsip/include/pjsua-lib/pjsua.h
 +++ b/pjsip/include/pjsua-lib/pjsua.h
-< at >< at > -1543,6 +1543,8 < at >< at > PJ_DECL(pjmedia_endpt*) pjsua_get_pjmedia_endpt(void);
+< at >< at > -1543,6 +1543,8 < at >< at > PJ_DECL(pjmedia_endpt*) pjsua_get_pjmedi
  PJ_DECL(pj_pool_factory*) pjsua_get_pool_factory(void);
  
  
< at >< at > -22,8 +9,6 < at >< at > index 85dbbbb..ad3e020 100644
  
  /*****************************************************************************
   * Utilities.
-diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h
-index 6c27826..4ba91ed 100644
 --- a/pjsip/include/pjsua-lib/pjsua_internal.h
 +++ b/pjsip/include/pjsua-lib/pjsua_internal.h
 < at >< at > -261,6 +261,8 < at >< at > typedef struct pjsua_stun_resolve
< at >< at > -44,8 +29,6 < at >< at > index 6c27826..4ba91ed 100644
      pj_timer_entry snd_idle_timer;/**< Sound device idle timer.*/
      pjmedia_master_port*null_snd;  /**< Master port for null sound.*/
      pjmedia_port*null_port; /**< Null port.*/
-diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c
-index 7d53cad..8a882f3 100644
 --- a/pjsip/src/pjsua-lib/pjsua_media.c
 +++ b/pjsip/src/pjsua-lib/pjsua_media.c
 < at >< at > -588,7 +588,7 < at >< at > static void check_snd_dev_idle()
< at >< at > -53,29 +36,29 < at >< at > index 7d53cad..8a882f3 100644
       * there is no active call.
       */
 -    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL) && 
-+    if ((pjsua_var.snd_port[0]!=NULL || pjsua_var.null_snd!=NULL) && 
++    if ((pjsua_var.snd_port[0]!=NULL || pjsua_var.null_snd!=NULL) &&
  pjsua_var.snd_idle_timer.id == PJ_FALSE &&
  pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 &&
  call_cnt == 0 &&
-< at >< at > -2009,7 +2009,7 < at >< at > PJ_DEF(pj_status_t) pjsua_conf_connect( pjsua_conf_port_id source,
+< at >< at > -2008,7 +2008,7 < at >< at > PJ_DEF(pj_status_t) pjsua_conf_connect(
  pj_assert(status == PJ_SUCCESS);
  
  /* Check if sound device is instantiated. */
 -need_reopen = (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && 
-+need_reopen = (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL && 
++need_reopen = (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL &&
        !pjsua_var.no_snd);
  
  /* Check if sound device need to reopen because it needs to modify 
-< at >< at > -2067,7 +2067,7 < at >< at > PJ_DEF(pj_status_t) pjsua_conf_connect( pjsua_conf_port_id source,
+< at >< at > -2072,7 +2072,7 < at >< at > PJ_DEF(pj_status_t) pjsua_conf_connect(
  /* The bridge version */
  
  /* Create sound port if none is instantiated */
 -if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL && 
-+if (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL && 
++if (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL &&
      !pjsua_var.no_snd) 
  {
      pj_status_t status;
-< at >< at > -2679,9 +2679,9 < at >< at > static pj_status_t update_initial_aud_param()
+< at >< at > -2686,9 +2686,9 < at >< at > static pj_status_t update_initial_aud_pa
      pjmedia_aud_param param;
      pj_status_t status;
  
< at >< at > -87,7 +70,7 < at >< at > index 7d53cad..8a882f3 100644
  
      status = pjmedia_aud_stream_get_param(strm, &param);
      if (status != PJ_SUCCESS) {
-< at >< at > -2747,7 +2747,7 < at >< at > static pj_status_t open_snd_dev(pjmedia_snd_port_param *param)
+< at >< at > -2754,7 +2754,7 < at >< at > static pj_status_t open_snd_dev(pjmedia_
        1000 / param->base.clock_rate));
  
      status = pjmedia_snd_port_create2( pjsua_var.snd_pool, 
< at >< at > -96,24 +79,24 < at >< at > index 7d53cad..8a882f3 100644
      if (status != PJ_SUCCESS)
  return status;
  
-< at >< at > -2805,13 +2805,13 < at >< at > static pj_status_t open_snd_dev(pjmedia_snd_port_param *param)
+< at >< at > -2812,13 +2812,13 < at >< at > static pj_status_t open_snd_dev(pjmedia_
      }
  
      /* Connect sound port to the bridge */
 -    status = pjmedia_snd_port_connect(pjsua_var.snd_port,  
-+    status = pjmedia_snd_port_connect(pjsua_var.snd_port[0],  
++    status = pjmedia_snd_port_connect(pjsua_var.snd_port[0],
        conf_port );  
      if (status != PJ_SUCCESS) {  
  pjsua_perror(THIS_FILE, "Unable to connect conference port to "
          "sound device", status);  
 -pjmedia_snd_port_destroy(pjsua_var.snd_port);  
 -pjsua_var.snd_port = NULL;  
-+pjmedia_snd_port_destroy(pjsua_var.snd_port[0]);  
-+pjsua_var.snd_port[0] = NULL;  
++pjmedia_snd_port_destroy(pjsua_var.snd_port[0]);
++pjsua_var.snd_port[0] = NULL;
  return status;  
      }
  
-< at >< at > -2826,7 +2826,7 < at >< at > static pj_status_t open_snd_dev(pjmedia_snd_port_param *param)
+< at >< at > -2833,7 +2833,7 < at >< at > static pj_status_t open_snd_dev(pjmedia_
  pjmedia_aud_param si;
          pj_str_t tmp;
  
< at >< at > -122,7 +105,7 < at >< at > index 7d53cad..8a882f3 100644
  status = pjmedia_aud_stream_get_param(strm, &si);
  if (status == PJ_SUCCESS)
      status = pjmedia_aud_dev_get_info(si.rec_id, &rec_info);
-< at >< at > -2869,12 +2869,12 < at >< at > static pj_status_t open_snd_dev(pjmedia_snd_port_param *param)
+< at >< at > -2876,12 +2876,12 < at >< at > static pj_status_t open_snd_dev(pjmedia_
  static void close_snd_dev(void)
  {
      /* Close sound device */
< at >< at > -137,7 +120,7 < at >< at > index 7d53cad..8a882f3 100644
  pjmedia_aud_stream_get_param(strm, &param);
  
  if (pjmedia_aud_dev_get_info(param.rec_id, &cap_info) != PJ_SUCCESS)
-< at >< at > -2886,9 +2886,9 < at >< at > static void close_snd_dev(void)
+< at >< at > -2893,9 +2893,9 < at >< at > static void close_snd_dev(void)
       "%s sound capture device",
       play_info.name, cap_info.name));
  
< at >< at > -150,7 +133,7 < at >< at > index 7d53cad..8a882f3 100644
      }
  
      /* Close null sound device */
-< at >< at > -2968,6 +2968,35 < at >< at > PJ_DEF(pj_status_t) pjsua_set_snd_dev( int capture_dev,
+< at >< at > -2984,6 +2984,35 < at >< at > PJ_DEF(pj_status_t) pjsua_set_snd_dev( i
      return PJ_SUCCESS;
  }
  
< at >< at > -186,18 +169,16 < at >< at > index 7d53cad..8a882f3 100644
  
  /*
   * Get currently active sound devices. If sound devices has not been created
-< at >< at > -3054,8 +3083,8 < at >< at > PJ_DEF(pj_status_t) pjsua_set_ec(unsigned tail_ms, unsigned options)
- {
-     pjsua_var.media_cfg.ec_tail_len = tail_ms;
+< at >< at > -3088,7 +3117,7 < at >< at > PJ_DEF(pj_status_t) pjsua_set_ec(unsigne
+     pjsua_var.media_cfg.ec_options = options;

openwrt backfire 10.03.2 + batman-adv

Pedro Nuno Costa Rodrigues — 2012-05-23T18:22:30

Hello, my name is Pedro, and I'm writing from Portugal.

I would like to ask some questions about batman-adv in openwrt backfire
10.03.2.

I already wrote to http://www.open-mesh.org/wiki/open-mesh/MailingList  
(the mailing list of batman-adv routing protocol) but the developers  
of the batman-adv said to me, after some chat and replies, that this  
issue could be solved asking in the openwrt forum, because they didn't  
know how to solve the problem.

The problem happens when i build the openwrt image to use in my  
routers (i'm trying to build a batman-adv mesh network), the  
definitions of batman-adv protocol don't start when the routers boot,  
as i wish.

In /etc/config/ there are some configuration files, like dhcp,  
network, wireless, etc... and the file that i'm talking about is the  
"batman-adv" file configuration.
In that "batman-adv" file we can define if this specific router is a  
gateway server or client... if the visualization mode is server or  
client... etc...

After my definitions are saved and after rebooting the routers, the  
definitions don't start as i defined, but starts as defined by  
default...

It is necessary to do "batman-adv restart" to the changes take place...
All i want is the definitions start on boot and permanently...
Why after saving the parameters and rebooting the router, the  
batman-adv changes don't take effect?


This is the batman-adv configuration example for 1 of the routers:

config 'mesh' 'bat0'
             option 'interfaces' 'wifi'
             option 'aggregated_ogms' '1'
             option 'ap_isolation' '0'
             option 'bonding' '0'
             option 'fragmentation' '1'
             option 'gw_bandwidth' '5mbit/1024kbit'
             option 'gw_mode' 'server'
             #option 'gw_sel_class'
             option 'log_level' 'all'
             option 'orig_interval' '1000'
             option 'vis_mode' 'server'


When the router boots the definitions don't take effect, but after  
doing "batman-adv", everything works fine.

I know the issue "batman-adv" is not a issue to be discussed here, but  
i was thinking if the problem could be solved by changing something in  
the build process... (?)



Thank you very much.

I'm a portuguese student in telecomunications eletrotecnical  
engineering, in ISEP school-Oporto.
This about my final work for my master thesis.
I need some help.

Best regards.
Pedro Rodrigues