Re: [OpenWrt-Devel] [RFC/RFT] netifd: Initial OpenVSwitch support
On 10/02/14 11:49, Helmut Schaa wrote: What did you change to get this working now? I started from a clean build. In the previous version I played a little bit with verious version of OVS and some hack to the netidf script. Everything worked as expected on new image built from scratch. BTW the netifd was built from the upstream repo with your patch (generated from your git branch). Is the possibility to set the controller an option you are considering? R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC/RFT] netifd: Initial OpenVSwitch support
On 29/11/13 16:24, Helmut Schaa wrote: I'd appreciate any testing beside my own :D Hi, I did some testing on some alix boards. The config I'm using is the following: config device option name br-ovs option type ovs list ifname eth0 config interface wan option ifname br-ovs option proto dhcp Everything seems to work fine, the bridge is created and the interface is added to it. The only problem I;ve found is that if I change the device name from br-ovs to (for example) ovs at the next reboot the change is not applied. Also, the device section could benefit from an ovs-controller option to specify the controller for the switch. Tested with OpenVSwitch 2.0. R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC/RFT] netifd: Initial OpenVSwitch support
On 04/02/14 09:09, Helmut Schaa wrote: What if you write the config file after boot and run /etc/init.d/network reload? Does it also end up in a loop? Just tried, no, it does not loop. Ok, this helps a lot I guess. Maybe OVS is not up and running yet during boot or not yet initialized? Forgot to point out that it does not loop but it also does not work as expected. basically the bridge is not created. R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC/RFT] netifd: Initial OpenVSwitch support
On 04/02/14 10:31, Helmut Schaa wrote: But it works if you create it manually with ovs-vsctl? Yes the manual workflow works fine: create bridge, add interfaces set cotnroller. R. -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC/RFT] netifd: Initial OpenVSwitch support
On 03/02/14 16:57, Helmut Schaa wrote: What if you write the config file after boot and run /etc/init.d/network reload? Does it also end up in a loop? Just tried, no, it does not loop. However I noticed that by running /etc/init.d.network restart I get: Command failed: not found and in the logread there is an error from ovs-vsctl about a missing interface eth0. The interface is there of course (down) if I run ifconfig eth0 What version of ovs do you use? OVS 2.0 adapted from: https://github.com/schuza/openvswitch Helmut -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC/RFT] netifd: Initial OpenVSwitch support
is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#ifndef __NETIFD_SYSTEM_OVS_H
+#define __NETIFD_SYSTEM_OVS_H
+
+#include system.h
+
+struct ovs_config {
+ bool empty;
+ int tag;
+ char *base;
+};
+
+void system_ovs_if_clear_state(struct device *dev);
+int system_ovs_delbr(struct device *ovs);
+int system_ovs_addbr(struct device *ovs, struct ovs_config *cfg);
+int system_ovs_addport(struct device *ovs, struct device *dev);
+int system_ovs_delport(struct device *ovs, struct device *dev);
+
+#endif
diff --git a/system.h b/system.h
index ad74156..4f27e3a 100644
--- a/system.h
+++ b/system.h
@@ -129,4 +129,6 @@ void system_fd_set_cloexec(int fd);
int system_update_ipv6_mtu(struct device *device, int mtu);
+void system_set_disable_ipv6(struct device *dev, const char *val);
+
#endif
--
Roberto Riggio, Ph.D.
CREATE-NET
Network Security Solutions for Pervasive Computing Systems (iNSPIRE)
Senior Researcher
Via alla Cascata 56/D - 38123 Povo Trento (Italy)
e-mail: roberto.rig...@create-net.org
Tel: (+39) 0461 408400 - interno/extension 708
Fax: (+39) 0461 421157
www.create-net.org/~rriggio
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by persons or
entities other than the intended recipient is prohibited according to
the Italian Law 196/2003 of the Legislature. If you received this in
error, please contact the sender and delete the material from any
computer.
Le informazioni contenute in questo messaggio di posta elettronica e nei
file allegati sono da considerarsi strettamente riservate. Il loro
utilizzo e' consentito esclusivamente al destinatario del messaggio, per
le finalita' indicate nel messaggio stesso. Qualora riceveste questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla cancellazione del
messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo,
od utilizzarlo per finalita' diverse, costituisce comportamento
contrario ai principi dettati dal D. Lgs. 196/2003.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [OpenWRT-Devel][PATCH] add openvswitch 2.0.0 package
On 12/20/2013 03:51 PM, Helmut Schaa wrote: True. However, using the current patch you can just replace a type bridge with type ovs, specifying option iface eth0 eth1 and you will get an ovs containing eth0 and eth1 as ports. I tried to give a look at the new netifd infrastructure but I could not figure it out where the dependencies for the standard linux bridge are. In the previous version of openwrt (the one bash based) there were some script were the brctl util was called (i think), but now I'm not that sure how this is done. R, ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [OpenWRT-Devel][PATCH] add openvswitch 2.0.0 package
Hi, On 11/08/2013 11:42 PM, Pete Holland wrote: This is a patch for the most recent stable build of OpenvSwitch (2.0.0). It supports kernels 2.6.32 - 3.10.x It was taken and updated from Julius Shulz-Zander's work: https://github.com/schuza/openvswitch Very interesting work. I'm currently using ovs 1.9 mostly because i like the features enabled by netifd unfortunatelly this needs the brcompat module which was dropped. But I also saw another patch for adding support ovs support to netifd. Btw I'm having some alignment issues with ovs on the ixp4xx platform. Basically some OpenFlow field are reported with error to the controller. For example an ip 192.168.9.56 is reported as 9.56.129.168. Anybody using ovs on a non-x86 target? R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [OpenWRT-Devel][PATCH] add openvswitch 2.0.0 package
On 12/20/2013 03:02 PM, Helmut Schaa wrote: Yep, that was me. I'm using the patch on openwrt since some time now and am quite happy. I looked at it and I;m not sure if you can define a device as bridge and add other interfaces to it. At the moment it seems to me that you define another type for the device insteead I liked brcompt because i could completelly replace the linux bridge with OVS. I've got another similar patch for hostapd. What is the purpose of the integration? I'm using ovs on mips (BE) but only with a local controller and haven't noticed any problems yet. Is your controller running a different architecture then the openwrt device? I tried all of them :) Pox chokes itself, beacon and floodlight parse the packet but with the messed up fields (link level fields are ok, only the network fields are messed up). I run the controllers on my laptop (x86). Helmut R ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Upgrade numpy package
Upgrade the numpy package from version 1.0.4 to version 1.7.1
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
---
Index: lang/numpy/Makefile
===
--- lang/numpy/Makefile (revision 37838)
+++ lang/numpy/Makefile (working copy)
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2008-2009 OpenWrt.org
+# Copyright (C) 2008-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,12 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=numpy
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.7.1
PKG_RELEASE:=1
+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/numpy
-PKG_MD5SUM:=8f011e9d7697da570efaac61c51725e0
+PKG_SOURCE_URL:=http://sourceforge.net/projects/numpy/files/NumPy/$(PKG_VERSION)/
+PKG_MD5SUM:=0ab72b3b83528a7ae79c6df9042d61c6
+PKG_BUILD_DEPENDS:=python
+
include $(INCLUDE_DIR)/package.mk
$(call include_mk, python-package.mk)
@@ -23,29 +26,22 @@
CATEGORY:=Languages
TITLE:=numpy
URL:=http://numpy.sf.net
- DEPENDS:=+python-mini @TARGET_x86||TARGET_olpc||TARGET_uml @BROKEN
+ DEPENDS:=+python-mini
endef
define Package/numpy/description
- API to GTK and glade library from python
+ Numpy
endef
-define Build/Compile
- cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) $(MAKE_VARS) python2.5
./setup.py install --prefix=$(PKG_INSTALL_DIR)/usr
+define PyPackage/numpy/filespec
++|$(PYTHON_PKG_DIR)/numpy
endef
-define Package/numpy/install
- $(INSTALL_DIR) $(1)
- $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
+CFLAGS += -I $(PKG_BUILD_DIR)/numpy/core/include/numpy/fenv/
-define Require/python25-dev
-[ -e /usr/include/python2.5/pyconfig.h ]
+define Build/Compile
+ cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) $(MAKE_VARS) python ./setup.py
install --prefix=$(PKG_INSTALL_DIR)/usr
endef
-$(eval $(call Require,python25-dev, \
- Please install Python 2.5 (including development headers and libraries)
\
-))
-
+$(eval $(call PyPackage,numpy))
$(eval $(call BuildPackage,numpy))
-
Index: lang/numpy/patches/100-compile.patch
===
--- lang/numpy/patches/100-compile.patch(revision 37838)
+++ lang/numpy/patches/100-compile.patch(working copy)
@@ -1,112 +1,33 @@
-diff -urN numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h
numpy-1.0.4.patched/numpy/core/include/numpy/ufuncobject.h
numpy-1.0.4/numpy/core/include/numpy/ufuncobject.h 2007-11-07
22:05:15.0 +
-+++ numpy-1.0.4.patched/numpy/core/include/numpy/ufuncobject.h 2008-05-25
11:07:14.0 +0100
-@@ -284,7 +284,7 @@
- #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
+--- a/numpy/core/include/numpy/ufuncobject.h
b/numpy/core/include/numpy/ufuncobject.h
+@@ -229,7 +229,7 @@ typedef struct _loop1d_info {
- #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
+ #if defined(__GLIBC__) || defined(__APPLE__) || \
+ defined(__MINGW32__) || defined(__FreeBSD__)
-#include fenv.h
+#include fenv/fenv.h
#elif defined(__CYGWIN__)
#include fenv/fenv.c
#endif
-diff -urN numpy-1.0.4/numpy/core/setup.py
numpy-1.0.4.patched/numpy/core/setup.py
numpy-1.0.4/numpy/core/setup.py2007-11-07 22:06:43.0 +
-+++ numpy-1.0.4.patched/numpy/core/setup.py2008-05-25 11:07:14.0
+0100
-@@ -36,6 +36,7 @@
+--- a/numpy/core/src/npymath/ieee754.c.src
b/numpy/core/src/npymath/ieee754.c.src
+@@ -585,7 +585,7 @@ void npy_set_floatstatus_invalid(void)
- def generate_config_h(ext, build_dir):
- target = join(build_dir,'config.h')
-+log.info(---abc)
- if newer(__file__,target):
- config_cmd = config.get_config_cmd()
- log.info('Generating %s',target)
-@@ -73,6 +74,7 @@
- nosmp = 1
- except KeyError:
- nosmp = 0
-+nosmp = 1
- if nosmp: moredefs = [('NPY_ALLOW_THREADS', '0')]
- else: moredefs = []
- #
-@@ -123,8 +125,9 @@
- target_f.write('#define %s\n' % (d))
- else:
- target_f.write('#define %s %s\n' % (d[0],d[1]))
--if not nosmp: # default is to use WITH_THREAD
--target_f.write('#ifdef WITH_THREAD\n#define NPY_ALLOW_THREADS
1\n#else\n#define NPY_ALLOW_THREADS 0\n#endif\n')
-+log.info(---abc)
-+#if not nosmp: # default is to use WITH_THREAD
-+target_f.write('#ifdef WITH_THREAD\n#define NPY_ALLOW_THREADS
1\n#else\n#define NPY_ALLOW_THREADS 0\n#endif\n')
- target_f.close()
- print 'File:',target
- target_f = open(target)
-diff -urN numpy-1.0.4/numpy/distutils/unixccompiler.py
numpy-1.0.4.patched/numpy/distutils/unixccompiler.py
numpy-1.0.4/numpy/distutils
[OpenWrt-Devel] [PATCH] Fix click router package
The current version of the click package is utterly broken. This new version
provides an userspace version of the package compiled with the wifi elements.
Tested on the x86 target (ALIX)
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
---
diff --git a/net/click/Makefile b/net/click/Makefile
index ef48d79..9518db1 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -8,68 +8,53 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=click
-PKG_VERSION:=20101020
+PKG_VERSION:=20130801
PKG_RELEASE:=1
-PKG_REV:=8f521a2dcd58ea8205b3b6070be605a21fb9154b
+PKG_REV:=72bfad3a63072b5079d9cfadb18328c60c7c42be
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://read.cs.ucla.edu/git/click
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=git://github.com/kohler/click.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MD5SUM:=c3cba1c923d0a034cc518720b5ba7b40
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=git
include $(INCLUDE_DIR)/package.mk
define Package/click
SECTION:=net
CATEGORY:=Network
- DEPENDS:=@BROKEN
- TITLE:=Click Modular Router
- URL:=http://read.cs.ucla.edu/click
+ SUBMENU:=Routing and Redirection
+ TITLE:=The Click Modular Router
+ MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
+ DEPENDS:=+kmod-tun +libpcap +libstdcpp
+ URL:=http://www.read.cs.ucla.edu/click/
endef
define Package/click/Description
The Click Modular Router userspace package
endef
-TARGET_CFLAGS += -static -O2 -MD
-TARGET_CXXFLAGS += -static -O2 -MD
+EXTRA_CFLAGS=-MD
-define Build/Configure
- (cd $(PKG_BUILD_DIR); \
- rm -rf config.{cache,status} ; \
- ./configure \
- --prefix=/usr \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_HOST_NAME) \
- --build=$(GNU_BUILD_NAME) \
- --enable-tools=mixed \
- --enable-userlevel \
- --enable-wifi \
- --enable-fixincludes \
- --disable-linuxmodule \
- )
-endef
+CONFIGURE_ARGS += \
+ --enable-tools=mixed \
+ --enable-userlevel \
+ --enable-wifi \
+ --disable-linuxmodule \
+ --disable-dynamic-linking \
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- tools elementmap.xml
- (cd $(PKG_BUILD_DIR)/userlevel; \
- ../tools/click-mkmindriver/click-mkmindriver -p $(PKG_NAME) -C
.. \
- -f $(PKG_BUILD_DIR)/conf/wifi/dump.click \
- -A --all -E Discard -E Print; \
- )
- $(MAKE) -C $(PKG_BUILD_DIR) MINDRIVER=$(PKG_NAME)
+ $(call Build/Install/Default, install)
endef
define Package/click/install
- $(INSTALL_DIR) $(1)/usr
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/share/click
- $(CP) $(PKG_BUILD_DIR)/userlevel/$(PKG_NAME)click $(1)/usr/bin/click
- $(CP) $(PKG_BUILD_DIR)/tools/click-align/click-align
$(1)/usr/bin/click-align
- $(CP) $(PKG_BUILD_DIR)/elementmap.xml
$(1)/usr/share/click/elementmap.xml
+ $(CP) $(PKG_BUILD_DIR)/conf/wing/write_handler $(1)/usr/bin/
+ $(CP) $(PKG_BUILD_DIR)/conf/wing/read_handler $(1)/usr/bin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/click $(1)/usr/bin/click
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/click-align $(1)/usr/bin/click-align
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/click/elementmap.xml
$(1)/usr/share/click/elementmap.xml
endef
$(eval $(call BuildPackage,click))
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] GRUB2 on Geos x86?
On 11/02/2012 10:30 AM, Russell Senior wrote: David Or is it actually the OpenWRT image that's the problem? If you David boot the working x86-generic-net45xx image on a Geos or David alix2, shouldn't you at least get *some* serial output from the David kernel as it boots, before something goes wrong? Same problem also here on alix2. I've tried to run the soekris image but nothing changed. R. -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATH] Upgrade wing package
Upgrade wing package to latest git revision. Fixes a segfault which
could happen in very particular situations. Plus a few netifd fixes.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/Makefile
===
--- net/wing/Makefile (revision 32900)
+++ net/wing/Makefile (working copy)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20120625
+PKG_VERSION:=20120805
PKG_RELEASE:=1
-PKG_REV:=ce245718dd01fad9a9bd78dd5792245b7cdd09aa
+PKG_REV:=d189e36d111788a647cd784536137acbe7a92e17
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://github.com/rriggio/click.git
@@ -67,7 +67,7 @@
-f $(PKG_BUILD_DIR)/conf/wing/sample.click \
-A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \
-E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \
- -E RadiotapEncapHT -E SetTXRateHT \
+ -E SetTXRateHT \
-E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \
-E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \
-E FairBuffer -E DeAggregator -E DWRRSched -E WFQSched -E
WRRSched; \
Index: net/wing/files/usr/bin/wing_status
===
--- net/wing/files/usr/bin/wing_status (revision 32900)
+++ net/wing/files/usr/bin/wing_status (working copy)
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2006, Roberto Riggio
+# Copyright (c) 2012, Roberto Riggio
#
# All rights reserved.
#
@@ -37,6 +37,7 @@
ARP=0
GATEWAY=0
PROBES=0
+INTERFACES=0
show_status() {
@@ -58,6 +59,11 @@
read_handler lt.hosts
}
+ [ $INTERFACES = 1 ] {
+ printf \nInterfaces:\n
+ read_handler lt.interfaces
+ }
+
[ $LINKS = 1 ] {
printf \nLinks:\n
read_handler lt.links
@@ -82,6 +88,8 @@
for interface in $interfaces; do
printf \nBroadcast statistics ($interface):\n
read_handler wr/es/es_$interface.bcast_stats
+ printf \nBroadcast statistics HT ($interface):\n
+ read_handler wr/es/es_$interface.bcast_stats_ht
done
}
@@ -97,9 +105,10 @@
ARP=1
GATEWAY=1
PROBES=1
+ INTERFACES=1
fi
-while getopts rshlagp OPTVAL
+while getopts rshlagpi OPTVAL
do
case $OPTVAL in
r) ROUTES=1
@@ -110,6 +119,8 @@
;;
l) LINKS=1
;;
+ i) INTERFACES=1
+ ;;
a) ARP=1
;;
g) GATEWAY=1
Index: net/wing/files/lib/netifd/proto/wing.sh
===
--- net/wing/files/lib/netifd/proto/wing.sh (revision 32900)
+++ net/wing/files/lib/netifd/proto/wing.sh (working copy)
@@ -4,12 +4,12 @@
. ../netifd-proto.sh
init_proto $@
-proto_wing_init_config() {
- no_device=1
+proto_wing_init_config() {
+ no_device=1
available=1
-proto_config_add_string ipaddr
+proto_config_add_string ipaddr
proto_config_add_string netmask
-}
+}
proto_wing_teardown() {
local config=$1
@@ -32,7 +32,7 @@
local ifnames=
local hwaddrs=
- # temporary hack waiting for a way to delay wing interfaces until the
+ # temporary hack waiting for a way to delay wing interfaces until the
# wifi sub-system has been brought up
sleep 15
@@ -47,6 +47,7 @@
local profile rc ls metric prefix period tau debug
+ config_load network
config_get profile $config profile bulk
config_get rc $config rc minstrel
config_get ls $config ls fcfs
@@ -83,6 +84,8 @@
[ $debug == 0 ] dbg= || dbg=-d
+ export CLICK_BACKTRACE=1
+
/usr/bin/click_config -p $profile -r $rc -s $ls -l $metric \
-m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
| sed -e s/__XR_IFNAME__/$link/g \
@@ -111,13 +114,19 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$link.pid
+uci_set_state network $config ifname $iface
+uci_set_state network $config ipaddr $ipaddr
+uci_set_state network $config netmask $netmask
+uci_set_state network $config gateway 0.0.0.0
+
env -i ACTION=ifup INTERFACE=$config DEVICE=$link PROTO=wing
/sbin/hotplug-call link
proto_init_update $link 1
- proto_add_ipv4_address $ipaddr $netmasj
+ proto_add_ipv4_address $ipaddr $netmask
+ proto_add_ipv4_route $prefix.0.0.0 255.0.0.0 $iface
route -n | grep -q '^0.0.0.0' || {
- proto_add_ipv4_route 0.0.0.0 0
+ proto_add_ipv4_route 0.0.0.0 0 $iface
}
proto_send_update $config
___
openwrt
[OpenWrt-Devel] [PATH] Upgrade wing package
Upgrade wing package to latest git revision. Fixes a segfault which
could happen in very particular situations. Plus a few netifd fixes.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/Makefile
===
--- net/wing/Makefile (revision 32900)
+++ net/wing/Makefile (working copy)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20120625
-PKG_RELEASE:=1
-PKG_REV:=ce245718dd01fad9a9bd78dd5792245b7cdd09aa
+PKG_VERSION:=20120726
+PKG_RELEASE:=2
+PKG_REV:=8ff3b88f421a486fe52c3e33d3e7e1868b113b91
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://github.com/rriggio/click.git
@@ -67,7 +67,7 @@
-f $(PKG_BUILD_DIR)/conf/wing/sample.click \
-A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \
-E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \
- -E RadiotapEncapHT -E SetTXRateHT \
+ -E SetTXRateHT \
-E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \
-E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \
-E FairBuffer -E DeAggregator -E DWRRSched -E WFQSched -E
WRRSched; \
Index: net/wing/files/lib/netifd/proto/wing.sh
===
--- net/wing/files/lib/netifd/proto/wing.sh (revision 32900)
+++ net/wing/files/lib/netifd/proto/wing.sh (working copy)
@@ -4,12 +4,12 @@
. ../netifd-proto.sh
init_proto $@
-proto_wing_init_config() {
- no_device=1
+proto_wing_init_config() {
+ no_device=1
available=1
-proto_config_add_string ipaddr
+proto_config_add_string ipaddr
proto_config_add_string netmask
-}
+}
proto_wing_teardown() {
local config=$1
@@ -32,7 +32,7 @@
local ifnames=
local hwaddrs=
- # temporary hack waiting for a way to delay wing interfaces until the
+ # temporary hack waiting for a way to delay wing interfaces until the
# wifi sub-system has been brought up
sleep 15
@@ -111,13 +111,19 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$link.pid
+uci_set_state network $config ifname $iface
+uci_set_state network $config ipaddr $ipaddr
+uci_set_state network $config netmask $netmask
+uci_set_state network $config gateway 0.0.0.0
+
env -i ACTION=ifup INTERFACE=$config DEVICE=$link PROTO=wing
/sbin/hotplug-call link
proto_init_update $link 1
- proto_add_ipv4_address $ipaddr $netmasj
+ proto_add_ipv4_address $ipaddr $netmask
+ proto_add_ipv4_route $prefix.0.0.0 255.0.0.0 $iface
route -n | grep -q '^0.0.0.0' || {
- proto_add_ipv4_route 0.0.0.0 0
+ proto_add_ipv4_route 0.0.0.0 0 $iface
}
proto_send_update $config
Index: net/wing/files/usr/bin/wing_status
===
--- net/wing/files/usr/bin/wing_status (revision 32900)
+++ net/wing/files/usr/bin/wing_status (working copy)
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (c) 2006, Roberto Riggio
+# Copyright (c) 2012, Roberto Riggio
#
# All rights reserved.
#
@@ -37,6 +37,7 @@
ARP=0
GATEWAY=0
PROBES=0
+INTERFACES=0
show_status() {
@@ -58,6 +59,11 @@
read_handler lt.hosts
}
+ [ $INTERFACES = 1 ] {
+ printf \nInterfaces:\n
+ read_handler lt.interfaces
+ }
+
[ $LINKS = 1 ] {
printf \nLinks:\n
read_handler lt.links
@@ -82,6 +88,8 @@
for interface in $interfaces; do
printf \nBroadcast statistics ($interface):\n
read_handler wr/es/es_$interface.bcast_stats
+ printf \nBroadcast statistics HT ($interface):\n
+ read_handler wr/es/es_$interface.bcast_stats_ht
done
}
@@ -97,9 +105,10 @@
ARP=1
GATEWAY=1
PROBES=1
+ INTERFACES=1
fi
-while getopts rshlagp OPTVAL
+while getopts rshlagpi OPTVAL
do
case $OPTVAL in
r) ROUTES=1
@@ -110,6 +119,8 @@
;;
l) LINKS=1
;;
+ i) INTERFACES=1
+ ;;
a) ARP=1
;;
g) GATEWAY=1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Port wing package to netifd
Port the wing package to the new netifd infrastructure.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
diff -urN net/wing/files/etc/uci-defaults/wing
net/wing/files/etc/uci-defaults/wing
--- net/wing/files/etc/uci-defaults/wing2012-07-06 18:12:46.269617774
+0100
+++ net/wing/files/etc/uci-defaults/wing2012-06-15 19:54:16.698206262
+0100
@@ -2,18 +2,23 @@
uci set network.mesh=interface
uci set network.mesh.proto=wing
-uci add firewall zone
-uci set firewall.@zone[-1].name=mesh
-uci set firewall.@zone[-1].input=ACCEPT
-uci set firewall.@zone[-1].output=ACCEPT
-uci set firewall.@zone[-1].forward=REJECT
-uci set firewall.@zone[-1].masq=1
+uci delete firewall.zone_mesh
+uci set firewall.zone_mesh=zone
+uci set firewall.zone_mesh.name=mesh
+uci set firewall.zone_mesh.input=ACCEPT
+uci set firewall.zone_mesh.output=ACCEPT
+uci set firewall.zone_mesh.forward=REJECT
+uci set firewall.zone_mesh.masq=1
-uci add firewall forwarding
-uci set firewall.@forwarding[-1].src=lan
-uci set firewall.@forwarding[-1].dest=mesh
+uci delete firewall.fwd_lan_mesh
+uci set firewall.fwd_lan_mesh=forwarding
+uci set firewall.fwd_lan_mesh.src=lan
+uci set firewall.fwd_lan_mesh.dest=mesh
-uci add firewall forwarding
-uci set firewall.@forwarding[-1].src=mesh
-uci set firewall.@forwarding[-1].dest=wan
+uci delete firewall.fwd_mesh_wan
+uci set firewall.fwd_mesh_wan=forwarding
+uci set firewall.fwd_mesh_wan.src=mesh
+uci set firewall.fwd_mesh_wan.dest=wan
+
+uci commit
diff -urN net/wing/files/lib/netifd/proto/wing.sh
net/wing/files/lib/netifd/proto/wing.sh
--- net/wing/files/lib/netifd/proto/wing.sh 1970-01-01
01:00:00.0 +0100
+++ net/wing/files/lib/netifd/proto/wing.sh 2012-06-25
13:46:49.490701413 +0100
@@ -0,0 +1,160 @@
+#!/bin/sh
+
+. /etc/functions.sh
+. ../netifd-proto.sh
+init_proto $@
+
+proto_wing_init_config() {
+ no_device=1
+ available=1
+proto_config_add_string ipaddr
+ proto_config_add_string netmask
+}
+
+proto_wing_teardown() {
+ local config=$1
+ local link=wing-$config
+ [ -f /var/run/$link.pid ] {
+ kill -9 $(cat /var/run/$link.pid)
+ rm /var/run/$link.pid
+ }
+ env -i ACTION=ifdown INTERFACE=$config DEVICE=$link PROTO=wing
/sbin/hotplug-call link
+}
+
+proto_wing_setup() {
+
+ local iface=$2
+ local config=$1
+ local link=wing-$config
+
+ local hwmodes=
+ local freqs=
+ local ifnames=
+ local hwaddrs=
+
+ # temporary hack waiting for a way to delay wing interfaces until the
+ # wifi sub-system has been brought up
+ sleep 15
+
+ config_load wireless
+ config_foreach wing_list_interfaces wifi-iface
+
+ # start click router
+ if [ $hwmodes = -o $freqs = -o $ifnames = -o $hwaddrs
= ]; then
+ logger -t $config No raw interfaces available. Exiting.
+ exit 1
+ fi
+
+ local profile rc ls metric prefix period tau debug
+
+ config_get profile $config profile bulk
+ config_get rc $config rc minstrel
+ config_get ls $config ls fcfs
+ config_get metric $config metric wcett
+ config_get prefix $config prefix 6
+ config_get period $config period 1
+ config_get tau $config tau 10
+ config_get_bool debug $config debug false
+
+ local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
+ local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F:
'{printf 0x%s 0x%s 0x%s,$4,$5,$6}'))
+ local bcast=$prefix.255.255.255
+ local netmask=255.0.0.0
+
+ if ! wing_template_available profile $profile; then
+ logger -t $config Unable to configure router. Exiting.
+ exit 1
+ fi
+
+ if ! wing_template_available rc $rc; then
+ logger -t $config Unable to configure rate control. Exiting.
+ exit 1
+ fi
+
+ if ! wing_template_available ls $ls; then
+ logger -t $config Unable to configure link scheduler.
Exiting.
+ exit 1
+ fi
+
+ if [ $profile = -o $rc = ]; then
+ logger -t $config Unable to generate template. Exiting.
+ exit 1
+ fi
+
+ [ $debug == 0 ] dbg= || dbg=-d
+
+ /usr/bin/click_config -p $profile -r $rc -s $ls -l $metric \
+ -m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
+ | sed -e s/__XR_IFNAME__/$link/g \
+ | sed -e s/__XR_IP__/$ipaddr/g \
+ | sed -e s/__XR_BCAST__/$bcast/g \
+ | sed -e s/__XR_NM__/$netmask/g \
+ | sed -e s/__XR_PERIOD__/$period/g \
+ | sed -e s/__XR_TAU__/$tau/g /tmp/$link.click
+
+ /usr/bin/click-align /tmp/$link.click /tmp/$link-aligned.click
2/var/log/$link.log
+ [ ! -c /dev/net/tun ] {
+ mkdir -p /dev/net/
+ mknod /dev/net/tun c 10 200
+ if [ ! -c /dev/net/tun
[OpenWrt-Devel] Latest netifd versions
Hi, after the recent updates to the netifd, is there any way to delay starting interfaces implementing a certain protocol until other interface are brought up (a sort of dependency mechanism)? Thanks R. -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] About the new netifd infrastructure
On 06/02/2012 06:53 PM, Felix Fietkau wrote: - available=1 ??? available=1 means that the interface can be brought up immediately instead of having to wait for an external trigger (usually only used together with no_device; if the interface is bound to a device, device presence controls interface availability). Thanks again for the info (sorry for replying directly yto you and not to the list). In my case I must wait for ALL the interfaces in /etc/config/wireless to be created. So it seems that I should not set available=1, but I'm not sure for which trigger I should wait. The simplest hack would be to add a sleep in the script, however I was looking for something more elegant. - Felix R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] About the new netifd infrastructure
On 05/30/2012 04:09 PM, Felix Fietkau wrote:
Do you have any call to proto_init_update/proto_send_update in there,
similar to what the dhcp script does when it has acquired a lease?
Hi, thanks for the feedback. I'm making some progresses now. This is the
current script:
#!/bin/sh
[ -n $INCLUDE_ONLY ] || {
. /etc/functions.sh
. ../netifd-proto.sh
init_proto $@
}
proto_wing_init_config() {
no_device=1
available=1
proto_config_add_string ipaddr
}
proto_wing_teardown() {
local config=$1
local link=wing-$config
[ -f /var/run/$link.pid ] {
kill -9 $(cat /var/run/$link.pid)
rm /var/run/$link.pid
}
}
proto_wing_setup() {
local config=$1
local link=wing-$config
# here I start the routing daemon which creates a TUN interface called
$link
proto_init_update $link 1
proto_add_ipv4_address $ipaddr $netmasj
route -n | grep -q '^0.0.0.0' || {
proto_add_ipv4_route 0.0.0.0 0
}
proto_send_update $config
}
[ -n $INCLUDE_ONLY ] || {
add_protocol wing
}
I have one major problem. The mesh works correctly if I call ifup mesh
AFTER the boot. The problem is that at bootstrap openwrt tries to bring
this interface up before the wifi. Is there a way to tell openwrt to
bring this interface up after wifi (or after all the other interface are up)
Could you explain briefly when to use the following constructs:
- no_device=1, this should be for case where the device is created at
run time like a tunnel or my mesh protocol
- available=1 ???
- proto_config_add_ ???
- json_get_var / json_add
Thanks
R.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] About the new netifd infrastructure
Hi, I'm trying to adapt a package (wing, a routing protocol for WMN) to the new netifd infrastructure. I defined a new protocol by adding a new script in /lib/netfid/proto called wing.sh. The script (inspired by dhcp.sh) defines the following functions: proto_wing_init_config() proto_wing_teardown() proto_wing_setup() In the network configuration I have config 'interface' 'mesh' option 'proto' 'wing' The problem is that whe I call ifup mesh none of the function about is actually called. Same result if I call directly: ubus call network.interface.mesh up what am I missing? -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] About the new netifd infrastructure
On 05/30/2012 03:12 PM, Felix Fietkau wrote:
Please post the full script. What does 'ifstatus mesh' show?
This is the skeleton of the script
#!/bin/sh
[ -n $INCLUDE_ONLY ] || {
. /etc/functions.sh
. ../netifd-proto.sh
init_proto $@
}
proto_wing_init_config() {
logger wing init
no_device=1
available=1
proto_config_add_string ipaddr
}
proto_wing_teardown() {
...
}
proto_wing_setup() {
logger wing setup
...
}
[ -n $INCLUDE_ONLY ] || {
add_protocol wing
}
the output of ifstatus mesh is:
{
up: false,
pending: true,
available: true,
autostart: true,
data: {
}
}
Thanks
R.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Update rrdtool to version 1.4.7
On 04/02/2012 05:16 PM, Florian Fainelli wrote: The configure scripts fails complaining it could not find neither glib 2.0 nor libxml-2.0. Can you please start from a fresh build and test again if that works for you? This is what I just did: 1) make distclean 2) svn up 3) enable xorg feed and update feeds 4) apply patch 5) install rrdtool, pango, cairo (the last two are not automatically added albeit they are deps of the rrdtool package) 6) make menuconfig with default target and rrdtool-lite package selected 7) make The build process finished with success. Thank you very much. -- Florian R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Update rrdtool to version 1.4.7
On 04/02/2012 05:16 PM, Florian Fainelli wrote: The configure scripts fails complaining it could not find neither glib 2.0 nor libxml-2.0. Can you please start from a fresh build and test again if that works for you? Starting from a fresh checkout, I patched the rrdtoo, package and run ./script/feed install rrdtool. However the required deps are not correctly installed. basically the system uses the deps defined for the older version of the package. I assume the reason is bacause the packages.index file is not updated. How can I address this problem? -- Florian R ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt
On 03/21/2012 01:02 AM, da...@lang.hm wrote: Would it be possible to break this into two packages, one without the graphing and the second the graphing tools? I was planning do do exactly that after I manage to compile the python bindings (which are important to me). R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Update rrdtool to version 1.4.7
This patch update rrdtool to version 1.4.7. Two version of the package
are provided:
rrdtool, which supports the graph command and links with pango and cairo
(from the xorg feed)
rrdtool-lite, which does NOT support the graph command and thus do not
requires pango and cairo
The first version requires also a font to be installed on openwrt, the
patched makefile requires a font to be placed in the data directory of
the package, however I'm not sure how I should post the font (attachment?)
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: utils/rrdtool/Makefile
===
--- utils/rrdtool/Makefile (revision 31050)
+++ utils/rrdtool/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.30
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.7
+PKG_RELEASE:=1
PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb
+PKG_MD5SUM:=ffe369d8921b4dfdeaaf43812100c38f
PKG_BUILD_DEPENDS:=python
@@ -26,6 +26,8 @@
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
$(call include_mk, python-package.mk)
define Package/rrdtool/Default
@@ -39,28 +41,42 @@
$(call Package/rrdtool/Default)
SECTION:=libs
CATEGORY:=Libraries
- TITLE+= management library (v1.2.x)
- DEPENDS+= +libart +libfreetype +libpng +zlib
+ TITLE+= library (v1.4.x)
+ DEPENDS+= +cairo +pango +libxml2
endef
+define Package/librrd-lite
+$(call Package/rrdtool/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE+= library (v1.4.x, no graph)
+ DEPENDS+= +libxml2
+endef
+
define Package/rrdcgi
$(call Package/rrdtool/Default)
- TITLE+= CGI graphing tool (v1.2.x)
+ TITLE+= CGI graphing tool (v1.4.x)
DEPENDS+= +librrd +cgilib
endef
define Package/rrdtool
$(call Package/rrdtool/Default)
- TITLE+= management tools (v1.2.x)
+ TITLE+= tools (v1.4.x)
DEPENDS+= +librrd
endef
+define Package/rrdtool-lite
+$(call Package/rrdtool/Default)
+ TITLE+= tools (v1.4.x, no graph)
+ DEPENDS+= +librrd-lite
+endef
+
define Package/python-rrd
$(call Package/rrdtool/Default)
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
- TITLE+= python bindings (v1.2.x)
+ TITLE+= python bindings (v1.4.x)
DEPENDS+= +python-mini +librrd
endef
@@ -73,14 +89,19 @@
--disable-perl \
--disable-tcl \
--disable-ruby \
- --without-x \
- --with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf \
+ --disable-lua \
CONFIGURE_VARS += \
rd_cv_ieee_works=yes \
rd_cv_null_realloc=nope \
ac_cv_func_mmap_fixed_mapped=yes \
+ifneq ($(SDK)$(CONFIG_PACKAGE_rrdtool-lite),)
+ CONFIGURE_ARGS += \
+ --disable-rrd_graph \
+ --with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono.ttf
+endif
+
ifneq ($(SDK)$(CONFIG_PACKAGE_rrdcgi),)
CONFIGURE_ARGS += --enable-rrdcgi
else
@@ -102,19 +123,24 @@
endef
define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
- $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.2/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.4/include/
+ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.4/lib/
endef
define Package/librrd/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
+endef
+
+define Package/librrd-lite/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts
- $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
- $(1)/usr/share/rrdtool/fonts/
+ $(CP) ./data/DejaVuSansMono.ttf $(1)/usr/share/rrdtool/fonts/
endef
define Package/rrdcgi/install
@@ -128,6 +154,12 @@
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
endef
+define Package/rrdtool-lite/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
+endef
+
define PyPackage/python-rrd/install
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
$(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
@@ -137,5 +169,8 @@
$(eval $(call BuildPackage,rrdcgi))
$(eval $(call BuildPackage,rrdtool))
+$(eval $(call BuildPackage,librrd-lite))
+$(eval $(call BuildPackage,rrdtool-lite))
+
$(eval $(call PyPackage,python-rrd))
$(eval $(call BuildPackage,python-rrd))
Index: utils/rrdtool/patches/020-x86-float-cast.patch
[OpenWrt-Devel] Porting rrdtool 1.4 to openwrt
Hi, I'm try to compile the latest rrdtool for openwrt. I did manage to compile it without support for graph, however when I try to compile it WITH supprot for graphs I get the following error during the configure phase: checking for pango_cairo_context_set_font_options in -lpango-1.0... no checking for pkg-config... (cached) pkg-config checking for pango_cairo_context_set_font_options in -lpango-1.0... no configure: WARNING: * I could not find a working copy of pangocairo. Check config.log for hints on why Both cairo and pango are compiled and installed by openwrt (they are even in the host system since I tried to compile rrdtool on my laptop). Any hints? -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt
On 03/20/2012 01:17 PM, Jo-Philipp Wich wrote: * I could not find a working copy of pangocairo. Check config.log for hints on why As usual, dig through config.log This is what I've found: /usr/include/libxml2/libxml/encoding.h:28:19: fatal error: iconv.h: No such file or directory libiconv is selected and compiled too. ~ Jow R ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt
On 03/20/2012 02:21 PM, Jo-Philipp Wich wrote: You need include $(INCLUDE_DIR)/nls.mk in your OpenWrt makefile. That will add the needed iconv search paths to TARGET_CFLAGS. Thanks, this works. However now I'm getting this after the compile process has started: make[5]: Entering directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/po' *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.17 but the autoconf macros are from gettext version 0.18 make[5]: *** [check-macro-version] Error 1 which at the end produces (I think): make[6]: Leaving directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/bindings' make[5]: Leaving directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/bindings' make[5]: Entering directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7' make[5]: Leaving directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7' make[4]: *** [all-recursive] Error 1 make[4]: Leaving directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7' make[3]: *** [all] Error 2 make[3]: Leaving directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7' make[2]: *** [/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/.built] Error 2 make[2]: Leaving directory `/home/rriggio/src/kamikaze/feeds/packages/utils/rrdtool' make[1]: *** [package/feeds/packages/rrdtool/install] Error 2 make[1]: Leaving directory `/home/rriggio/src/kamikaze' make: *** [package/rrdtool/install] Error 2 ~ Jow R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt
On 03/20/2012 04:28 PM, Roberto Riggio wrote: Thanks, this works. However now I'm getting this after the compile process has started: make[5]: Entering directory `/home/rriggio/src/kamikaze/build_dir/target-i386_uClibc-0.9.33/rrdtool-1.4.7/po' Forget about this. I little patch to a Makefile solved the issue. The package now compiles fine. I'm gonna submit a patch to the ML soon, however i do not know how to proceed with some external dependencies, namely pango and cairo that are now fetched from the xorg feed but are not available in the packages feed. Suggestions about how to proceed? R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Porting rrdtool 1.4 to openwrt
/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts
- $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
- $(1)/usr/share/rrdtool/fonts/
endef
define Package/rrdcgi/install
diff --git a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
b/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
deleted file mode 100644
index 507a0e9..000
--- a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
a/configure
-+++ b/configure
-@@ -26319,9 +26319,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test x/usr/include/libart-2.0 != x; then
-- CPPFLAGS=$CPPFLAGS -I/usr/include/libart-2.0
-- fi
- { echo $as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_25
- echo $ECHO_N checking for art_vpath_add_point in -lart_lgpl_2...
$ECHO_C6; }
- if test ${ac_cv_lib_art_lgpl_2_art_vpath_add_point+set} = set; then
-@@ -27915,9 +27912,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test x/usr/include/freetype2 != x; then
-- CPPFLAGS=$CPPFLAGS -I/usr/include/freetype2
-- fi
- { echo $as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype5
- echo $ECHO_N checking for FT_Init_FreeType in -lfreetype... $ECHO_C6; }
- if test ${ac_cv_lib_freetype_FT_Init_FreeType+set} = set; then
a/acinclude.m4
-+++ b/acinclude.m4
-@@ -20,9 +20,6 @@ AC_DEFUN([EX_CHECK_ALL],
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test x$7 != x; then
-- CPPFLAGS=$CPPFLAGS -I$7
-- fi
- dnl try compiling naked first
- AC_CHECK_LIB($1,$2, [
- AC_CHECK_HEADER($3,[LIBS=-l$1 ${LIBS};EX_CHECK_STATE=YES],[])],[])
diff --git a/utils/rrdtool/patches/020-x86-float-cast.patch
b/utils/rrdtool/patches/020-x86-float-cast.patch
deleted file mode 100644
index f382404..000
--- a/utils/rrdtool/patches/020-x86-float-cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rrdtool-1.2.30/src/rrd_format.h
-===
rrdtool-1.2.30.orig/src/rrd_format.h
-+++ rrdtool-1.2.30/src/rrd_format.h
-@@ -22,7 +22,7 @@
- /* #define RRD_VERSION 0002 */
- /* changed because microsecond precision requires another field */
- #define RRD_VERSION 0003
--#define FLOAT_COOKIE 8.642135E130
-+#define FLOAT_COOKIE ((double)8.642135E130)
-
- #include rrd_nan_inf.h
-
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
--
Roberto Riggio, Ph.D.
CREATE-NET
Network Security Solutions for Pervasive Computing Systems (iNSPIRE)
Senior Researcher
Via alla Cascata 56/D - 38123 Povo Trento (Italy)
e-mail: roberto.rig...@create-net.org
Tel: (+39) 0461 408400 - interno/extension 708
Fax: (+39) 0461 421157
www.create-net.org/~rriggio
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by persons or
entities other than the intended recipient is prohibited according to
the Italian Law 196/2003 of the Legislature. If you received this in
error, please contact the sender and delete the material from any
computer.
Le informazioni contenute in questo messaggio di posta elettronica e nei
file allegati sono da considerarsi strettamente riservate. Il loro
utilizzo e' consentito esclusivamente al destinatario del messaggio, per
le finalita' indicate nel messaggio stesso. Qualora riceveste questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla cancellazione del
messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo,
od utilizzarlo per finalita' diverse, costituisce comportamento
contrario ai principi dettati dal D. Lgs. 196/2003.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Development on MacOS
Hi, I hope this is not too much off topics. I was wondering if anybody on the list is doing openwrt development on macos? If so, could you comment on the overall experience? R. -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] PyRRD upstream patch
re-submit upstream patch for pyrrd. this time it should not be mangled. Signed-of-by: Roberto Riggio roberto.rig...@create-net.org -- Index: lang/pyrrd/patches/200-fetch.patch === --- lang/pyrrd/patches/200-fetch.patch (revision 0) +++ lang/pyrrd/patches/200-fetch.patch (revision 0) @@ -0,0 +1,31 @@ +--- a/pyrrd/backend/external.py2011-10-19 05:33:13 + b/pyrrd/backend/external.py2011-10-19 05:44:55 + +@@ -262,7 +262,7 @@ + data += [unicode(x) for x in obj.rra] + return (obj.filename, params + data) + +-if function == 'update': ++elif function == 'update': + validParams = ['template'] + params = common.buildParameters(obj, validParams) + FIRST_VALUE = 0 +@@ -275,15 +275,15 @@ + data = [data for data, nil in obj.values] + return (obj.filename, params + data) + +-if function == 'fetch': ++elif function == 'fetch': + validParams = ['resolution', 'start', 'end'] + params = common.buildParameters(obj, validParams) +-return (obj.filename, obj.cf, params) ++return (obj.filename, [obj.cf] + params) + +-if function == 'info': ++elif function == 'info': + return (obj.filename, obj) + +-if function == 'graph': ++elif function == 'graph': + validParams = ['start', 'end', 'step', 'title', + 'vertical_label', 'width', 'height', 'only_graph', + 'upper_limit', 'lower_limit', 'rigid', 'alt_autoscale', Index: lang/pyrrd/Makefile === --- lang/pyrrd/Makefile (revision 30801) +++ lang/pyrrd/Makefile (working copy) @@ -9,7 +9,7 @@ PKG_NAME:=pyrrd PKG_VERSION:=0.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=PyRRD-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://pypi.python.org/packages/source/P/PyRRD/ @@ -27,7 +27,7 @@ CATEGORY:=Languages TITLE:=PyRRD - An Object-Oriented Python Interface for RRDTool URL:=http://code.google.com/p/pyrrd/ - DEPENDS:=+python +distribute + DEPENDS:=+python +distribute +rrdtool endef define Package/pyrrd/description ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Add upstream patch to pyrrd package
This patch adds an upstream fix to the pyrrd package. It also adds the rrdtool package as external dependency. Signed-off-by: Roberto Riggio roberto.rig...@gmail.com -- Index: lang/pyrrd/patches/200-fetch.patch === --- lang/pyrrd/patches/200-fetch.patch (revision 0) +++ lang/pyrrd/patches/200-fetch.patch (revision 0) @@ -0,0 +1,31 @@ +--- a/pyrrd/backend/external.py2011-10-19 05:33:13 + b/pyrrd/backend/external.py2011-10-19 05:44:55 + +@@ -262,7 +262,7 @@ + data += [unicode(x) for x in obj.rra] + return (obj.filename, params + data) + +-if function == 'update': ++elif function == 'update': + validParams = ['template'] + params = common.buildParameters(obj, validParams) + FIRST_VALUE = 0 +@@ -275,15 +275,15 @@ + data = [data for data, nil in obj.values] + return (obj.filename, params + data) + +-if function == 'fetch': ++elif function == 'fetch': + validParams = ['resolution', 'start', 'end'] + params = common.buildParameters(obj, validParams) +-return (obj.filename, obj.cf, params) ++return (obj.filename, [obj.cf] + params) + +-if function == 'info': ++elif function == 'info': + return (obj.filename, obj) + +-if function == 'graph': ++elif function == 'graph': + validParams = ['start', 'end', 'step', 'title', + 'vertical_label', 'width', 'height', 'only_graph', + 'upper_limit', 'lower_limit', 'rigid', 'alt_autoscale', Index: lang/pyrrd/Makefile === --- lang/pyrrd/Makefile (revision 29964) +++ lang/pyrrd/Makefile (working copy) @@ -9,7 +9,7 @@ PKG_NAME:=pyrrd PKG_VERSION:=0.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=PyRRD-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://pypi.python.org/packages/source/P/PyRRD/ @@ -27,7 +27,7 @@ CATEGORY:=Languages TITLE:=PyRRD - An Object-Oriented Python Interface for RRDTool URL:=http://code.google.com/p/pyrrd/ - DEPENDS:=+python +distribute + DEPENDS:=+python +distribute +rrdtool endef define Package/pyrrd/description ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] x86 sysupgrade
I'm actually using sysupgrade on an alix 2c board and it works. I'm not keeping the actual configuration instead i have a script that: 1. downloads a new configuration from a server (a tar.gz) 2. downloads the new image 3. runs sysupgrade with the option to use an external archive for the configuration Basically is my way of doing a reset to factory configuration. On 25/01/2012 15:58, Martin Roecker wrote: Hi, On 23.01.2012 07:28, Philip Prindeville wrote: For those of us using x86-based platforms we'd like to have a way to do in-place upgrades without losing configuration state. How do you perform your updates at the moment? I ask because the only way to write a new image to my Alix 2D13 ist to use dd. Sysupgrade (with and without keeping configfiles) does not write the image. This seems to be a problem only with the squashfs image. Martin ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New package dstat
No, it is the same version. The version from the 20th wasn't in my outgoing mail box, so i thought that it was not sent. Sorry for the confusion. R. On 23/01/2012 19:13, Jo-Philipp Wich wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, is there any difference to the version from 20th? As far as I can see it is identical just that this one got mangled by your mailer. ~ Jow -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk8do0wACgkQdputYINPTPPcfgCfYztDILCGjltCqar0SUz/cL9s UbkAn3anNkgk8z3GsPo5A6afafGW6Pxo =I2Jf -END PGP SIGNATURE- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New package dstat
Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat written in python and with a very good plugin system. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org --- Index: utils/dstat/Makefile === --- utils/dstat/Makefile(revision 0) +++ utils/dstat/Makefile(revision 0) @@ -0,0 +1,47 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dstat +PKG_VERSION:=0.7.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://dag.wieers.com/home-made/dstat/ +PKG_MD5SUM:=bfea4dc8037a0b18fc40a4dfc104dcc8 + +include $(INCLUDE_DIR)/package.mk + +define Package/dstat + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Versatile resource statistics tool + URL:=http://dag.wieers.com/home-made/dstat/ + DEPENDS:=+python +endef + +define Package/dstat/description + Dstat is a versatile replacement for vmstat, iostat, netstat + and ifstat. Dstat overcomes some of their limitations and + adds some extra features, more counters and flexibility. + Dstat is handy for monitoring systems during performance + tuning tests, benchmarks or troubleshooting. +endef + +define Build/Compile +endef + +define Package/dstat/install +$(INSTALL_DIR) $(1)/usr/share/dstat +$(INSTALL_BIN) $(PKG_BUILD_DIR)/dstat $(1)/usr/share/dstat/dstat.py +$(INSTALL_DATA) $(PKG_BUILD_DIR)/plugins/dstat_*.py $(1)/usr/share/dstat/ +$(INSTALL_DIR) $(1)/usr/bin +$(LN) -sf ../share/dstat/dstat.py $(1)/usr/bin/dstat +endef + +$(eval $(call BuildPackage,dstat)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New package: dstat
Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat written in python and with a very good plugin system. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org --- Index: utils/dstat/Makefile === --- utils/dstat/Makefile(revision 0) +++ utils/dstat/Makefile(revision 0) @@ -0,0 +1,47 @@ +# +# Copyright (C) 2012 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dstat +PKG_VERSION:=0.7.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://dag.wieers.com/home-made/dstat/ +PKG_MD5SUM:=bfea4dc8037a0b18fc40a4dfc104dcc8 + +include $(INCLUDE_DIR)/package.mk + +define Package/dstat + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Versatile resource statistics tool + URL:=http://dag.wieers.com/home-made/dstat/ + DEPENDS:=+python +endef + +define Package/dstat/description + Dstat is a versatile replacement for vmstat, iostat, netstat + and ifstat. Dstat overcomes some of their limitations and + adds some extra features, more counters and flexibility. + Dstat is handy for monitoring systems during performance + tuning tests, benchmarks or troubleshooting. +endef + +define Build/Compile +endef + +define Package/dstat/install + $(INSTALL_DIR) $(1)/usr/share/dstat + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dstat $(1)/usr/share/dstat/dstat.py + $(INSTALL_DATA) $(PKG_BUILD_DIR)/plugins/dstat_*.py $(1)/usr/share/dstat/ + $(INSTALL_DIR) $(1)/usr/bin + $(LN) -sf ../share/dstat/dstat.py $(1)/usr/bin/dstat +endef + +$(eval $(call BuildPackage,dstat)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] new package python-eeml
A python package for generating eeml documents. In particular can be used to send sensor data to pachube (https://pachube.com/). Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: lang/python-eeml/patches/101-cross.patch === --- lang/python-eeml/patches/101-cross.patch(revision 0) +++ lang/python-eeml/patches/101-cross.patch(revision 0) @@ -0,0 +1,12 @@ +--- a/setup.py b/setup.py +@@ -1,5 +1,6 @@ +-from setuptools import setup +-from setuptools import find_packages ++#!/usr/bin/env python ++ ++from distutils.core import setup + + setup(name=Python EEML, + version=0.1, + Index: lang/python-eeml/Makefile === --- lang/python-eeml/Makefile (revision 0) +++ lang/python-eeml/Makefile (revision 0) @@ -0,0 +1,52 @@ +# +# Copyright (C) 2008-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-eeml +PKG_VERSION:=20111202 +PKG_RELEASE:=1 +PKG_REV:=9f0173e56a0b2a0ae7d3a2c76eb5428381912ac6 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://github.com/petervizi/python-eeml.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_PROTO:=git + +PKG_BUILD_DEPENDS:=python + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python-package.mk) + +define Package/python-eeml + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=python-eeml + URL:=http://petervizi.github.com/python-eeml/ + DEPENDS:=+python +distribute +endef + +define Package/python-eeml/description + A python package for generating eeml documents. +endef + +define Build/Compile + $(call Build/Compile/PyMod,., \ + install --prefix=/usr --root=$(PKG_INSTALL_DIR), \ + ) +endef + +define Package/python-eeml/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ + $(1)$(PYTHON_PKG_DIR)/ +endef + +$(eval $(call BuildPackage,python-eeml)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New package PyRRD
On 11/15/2011 01:19 AM, Nico wrote:
Hi Roberto,
Hi,
On Mon, Oct 10, 2011 at 11:18 AM, Roberto Riggio
roberto.rig...@create-net.org wrote:
This patch is a port of the PyRRD package to openwrt. PyRRD is a wrapper for
rrdtool for python. The API is so much better than the python bindings for
rrd.
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
Is the patch adding ez-setup.py really needed? It is building fine
here without it.
without i get this:
Traceback (most recent call last):
File ./setup.py, line 1, in module
from setuptools import setup
ImportError: No module named setuptools
(Sorry for the loong delay in handling this)
Likewise, I was exploring the outback :)
R.
--
-{Nico}
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
--
Roberto Riggio, Ph.D.
CREATE-NET
Network Security Solutions for Pervasive Computing Systems (iNSPIRE)
Senior Researcher
Via alla Cascata 56/D - 38123 Povo Trento (Italy)
e-mail: roberto.rig...@create-net.org
Tel: (+39) 0461 408400 - interno/extension 708
Fax: (+39) 0461 421157
www.create-net.org/~rriggio
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by persons or
entities other than the intended recipient is prohibited according to
the Italian Law 196/2003 of the Legislature. If you received this in
error, please contact the sender and delete the material from any
computer.
Le informazioni contenute in questo messaggio di posta elettronica e nei
file allegati sono da considerarsi strettamente riservate. Il loro
utilizzo e' consentito esclusivamente al destinatario del messaggio, per
le finalita' indicate nel messaggio stesso. Qualora riceveste questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla cancellazione del
messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo,
od utilizzarlo per finalita' diverse, costituisce comportamento
contrario ai principi dettati dal D. Lgs. 196/2003.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New package PyRRD
On 11/25/2011 09:14 PM, Nico wrote:
Try installing the distribute package, we can add that as a BUILD_DEPENDS.
In the makefile I have:
PKG_BUILD_DEPENDS:=python distribute
and
DEPENDS:=+python +distribute +rrdtool
But I still get
Traceback (most recent call last):
File ./setup.py, line 1, in module
from setuptools import setup
ImportError: No module named setuptools
Cheers,
--
-{Nico}
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
--
Roberto Riggio, Ph.D.
CREATE-NET
Network Security Solutions for Pervasive Computing Systems (iNSPIRE)
Senior Researcher
Via alla Cascata 56/D - 38123 Povo Trento (Italy)
e-mail: roberto.rig...@create-net.org
Tel: (+39) 0461 408400 - interno/extension 708
Fax: (+39) 0461 421157
www.create-net.org/~rriggio
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by persons or
entities other than the intended recipient is prohibited according to
the Italian Law 196/2003 of the Legislature. If you received this in
error, please contact the sender and delete the material from any
computer.
Le informazioni contenute in questo messaggio di posta elettronica e nei
file allegati sono da considerarsi strettamente riservate. Il loro
utilizzo e' consentito esclusivamente al destinatario del messaggio, per
le finalita' indicate nel messaggio stesso. Qualora riceveste questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla cancellazione del
messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo,
od utilizzarlo per finalita' diverse, costituisce comportamento
contrario ai principi dettati dal D. Lgs. 196/2003.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Upgrade wing package
This patch upgrades the wing package to the latest git revision. It also
removes a patch that has been merged upstream.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 28730)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -107,7 +107,9 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
ifconfig $iface $ipaddr netmask $netmask
- route add default dev $iface
+ route -n | grep -q '^0.0.0.0' || {
+ route add default dev $iface
+ }
uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
Index: net/wing/files/etc/uci-defaults/wing
===
--- net/wing/files/etc/uci-defaults/wing(revision 28730)
+++ net/wing/files/etc/uci-defaults/wing(working copy)
@@ -1,13 +1,6 @@
uci delete network.mesh
uci set network.mesh=interface
uci set network.mesh.proto=wing
-uci set network.mesh.rc=minstrel
-uci set network.mesh.ls=fcfs
-uci set network.mesh.metric=wcett
-uci set network.mesh.prefix=6
-uci set network.mesh.period=1
-uci set network.mesh.tau=10
-uci set network.mesh.debug=false
uci add firewall zone
uci set firewall.@zone[-1].name=mesh
Index: net/wing/patches/010-libc-compat.patch
===
--- net/wing/patches/010-libc-compat.patch (revision 28730)
+++ net/wing/patches/010-libc-compat.patch (working copy)
@@ -1,20 +0,0 @@
a/lib/radiotap.c
-+++ b/lib/radiotap.c
-@@ -16,6 +16,17 @@
- #include click/radiotap_iter.h
- #include click/platform.h
-
-+#if !defined(le32toh) || !defined(le16toh)
-+# if BYTE_ORDER == LITTLE_ENDIAN
-+#define le32toh(x) (x)
-+#define le16toh(x) (x)
-+# else
-+#include byteswap.h
-+#define le32toh(x) bswap_32(x)
-+#define le16toh(x) bswap_16(x)
-+# endif
-+#endif
-+
- /* function prototypes and related defs are in radiotap_iter.h */
-
- static const struct radiotap_align_size rtap_namespace_sizes[] = {
Index: net/wing/Makefile
===
--- net/wing/Makefile (revision 28730)
+++ net/wing/Makefile (working copy)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20110709
+PKG_VERSION:=2003
PKG_RELEASE:=1
-PKG_REV:=6aaea18b8e199781dc600681882cb2648f43ec38
+PKG_REV:=23e6455a1cfe0877334f0d18068a3fb47425b8a4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://github.com/rriggio/click.git
@@ -24,12 +24,13 @@
include $(INCLUDE_DIR)/host-build.mk
define Package/wing
- TITLE:=Wireless mesh networking toolkit
- SECTION:=net
- CATEGORY:=Network
- MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
- DEPENDS:=+kmod-tun +libpcap +libstdcpp
- URL:=http://www.wing-project.org/
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=Routing and Redirection
+ TITLE:=Wireless mesh networking toolkit
+ MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
+ DEPENDS:=+kmod-tun +libpcap +libstdcpp
+ URL:=http://www.wing-project.org/
endef
define Package/wing/Description
@@ -44,12 +45,16 @@
--enable-tools=host \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
--disable-dynamic-linking \
HOST_CONFIGURE_ARGS += \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
define Host/Compile
@@ -62,6 +67,7 @@
-f $(PKG_BUILD_DIR)/conf/wing/sample.click \
-A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \
-E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \
+ -E AggregateWingPacketType -E AggregateCounter \
-E RadiotapEncapHT -E SetTXRateHT \
-E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \
-E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Fix usb-modeswitch md5
Fix usb-modeswitch md5 Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: utils/usb-modeswitch/Makefile === --- utils/usb-modeswitch/Makefile (revision 28448) +++ utils/usb-modeswitch/Makefile (working copy) @@ -13,7 +13,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.draisberghof.de/usb_modeswitch -PKG_MD5SUM:=76f6978f18cac41f269a346a5d0f1052 +PKG_MD5SUM:=6d3c77807adc0fb609635440036d86e9 include $(INCLUDE_DIR)/package.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Upgrade wing package to latest git revision
This patch upgrades wing to the latest git revision. Plus it upgrades
some support scripts.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 28448)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -107,7 +107,9 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
ifconfig $iface $ipaddr netmask $netmask
- route add default dev $iface
+ route -n | grep -q '^0.0.0.0' || {
+ route add default dev $iface
+ }
uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
Index: net/wing/files/etc/uci-defaults/wing
===
--- net/wing/files/etc/uci-defaults/wing(revision 28448)
+++ net/wing/files/etc/uci-defaults/wing(working copy)
@@ -1,13 +1,6 @@
uci delete network.mesh
uci set network.mesh=interface
uci set network.mesh.proto=wing
-uci set network.mesh.rc=minstrel
-uci set network.mesh.ls=fcfs
-uci set network.mesh.metric=wcett
-uci set network.mesh.prefix=6
-uci set network.mesh.period=1
-uci set network.mesh.tau=10
-uci set network.mesh.debug=false
uci add firewall zone
uci set firewall.@zone[-1].name=mesh
Index: net/wing/Makefile
===
--- net/wing/Makefile (revision 28448)
+++ net/wing/Makefile (working copy)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20110709
+PKG_VERSION:=20111009
PKG_RELEASE:=1
-PKG_REV:=6aaea18b8e199781dc600681882cb2648f43ec38
+PKG_REV:=bd58fdc485af4b44a59fec41a1acaa915d76fa9a
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://github.com/rriggio/click.git
@@ -24,12 +24,13 @@
include $(INCLUDE_DIR)/host-build.mk
define Package/wing
- TITLE:=Wireless mesh networking toolkit
- SECTION:=net
- CATEGORY:=Network
- MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
- DEPENDS:=+kmod-tun +libpcap +libstdcpp
- URL:=http://www.wing-project.org/
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=Routing and Redirection
+ TITLE:=Wireless mesh networking toolkit
+ MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
+ DEPENDS:=+kmod-tun +libpcap +libstdcpp
+ URL:=http://www.wing-project.org/
endef
define Package/wing/Description
@@ -44,12 +45,16 @@
--enable-tools=host \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
--disable-dynamic-linking \
HOST_CONFIGURE_ARGS += \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
define Host/Compile
@@ -62,6 +67,7 @@
-f $(PKG_BUILD_DIR)/conf/wing/sample.click \
-A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \
-E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \
+ -E AggregateWingPacketType -E AggregateCounter \
-E RadiotapEncapHT -E SetTXRateHT \
-E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \
-E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New package PyRRD
ping On 10/10/2011 11:18, Roberto Riggio wrote: This patch is a port of the PyRRD package to openwrt. PyRRD is a wrapper for rrdtool for python. The API is so much better than the python bindings for rrd. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org --- ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New package PyRRD
This patch is a port of the PyRRD package to openwrt. PyRRD is a wrapper
for rrdtool for python. The API is so much better than the python
bindings for rrd.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
---
Index: lang/pyrrd/patches/100-setuptools.patch
===
--- lang/pyrrd/patches/100-setuptools.patch (revision 0)
+++ lang/pyrrd/patches/100-setuptools.patch (revision 0)
@@ -0,0 +1,304 @@
+diff -urN PyRRD-0.1.0.old//ez_setup.py PyRRD-0.1.0//ez_setup.py
+--- PyRRD-0.1.0.old//ez_setup.py 1970-01-01 01:00:00.0 +0100
PyRRD-0.1.0//ez_setup.py 2011-03-11 18:03:40.0 +0100
+@@ -0,0 +1,284 @@
++#!python
++Bootstrap setuptools installation
++
++If you want to use setuptools in your package's setup.py, just include this
++file in the same directory with it, and add this to the top of your setup.py::
++
++from ez_setup import use_setuptools
++use_setuptools()
++
++If you want to require a specific version of setuptools, set a download
++mirror, or use an alternate download directory, you can do so by supplying
++the appropriate options to ``use_setuptools()``.
++
++This file can also be run as a script to install or upgrade setuptools.
++
++import sys
++DEFAULT_VERSION = 0.6c11
++DEFAULT_URL = http://pypi.python.org/packages/%s/s/setuptools/; % sys.version[:3]
++
++md5_data = {
++'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
++'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
++'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
++'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
++'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
++'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
++'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
++'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
++'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
++'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
++'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
++'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
++'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
++'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
++'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
++'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
++'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
++'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
++'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
++'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
++'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
++'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
++'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
++'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
++'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
++'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
++'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
++'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
++'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
++'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
++'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
++'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
++'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
++'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
++'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
++'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
++'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
++'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
++'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
++'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
++'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
++'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
++}
++
++import sys, os
++try: from hashlib import md5
++except ImportError: from md5 import md5
++
++def _validate_md5(egg_name, data):
++if egg_name in md5_data:
++digest = md5(data).hexdigest()
++if digest != md5_data[egg_name]:
++print sys.stderr, (
++md5 validation of %s failed! (Possible download problem?)
++% egg_name
++)
++sys.exit(2)
++return data
++
++def use_setuptools(
++version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir
[OpenWrt-Devel] [PATCH] Bump simplejson version
Bump simplejson version Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: lang/simplejson/Makefile === --- lang/simplejson/Makefile(revision 28398) +++ lang/simplejson/Makefile(working copy) @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simplejson -PKG_VERSION:=2.1.6 +PKG_VERSION:=2.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/ -PKG_MD5SUM:=2f8351f6e6fe7ef25744805dfa56c0d5 +PKG_MD5SUM:=070c6467462bd63306f1756b01df6d70 PKG_BUILD_DEPENDS:=python include $(INCLUDE_DIR)/package.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Fix md5 hash for distribute package
Ping On 28/09/2011 21:01, Roberto Riggio wrote: As in the subj. THe current md5 hash for the distribute package is wrong. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Kill script
Which the openwrt way for a package to add a symlink to the init script to be called during the reboot phase? Basically I have an init script in /etc/init.d/ called foo. As a part of the image creation an SXXfoo script is created in /etc/rc.d/. What should I do in order to have also a KXXfoo link? Thanks Roberto ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Kill script
On 30/09/2011 15:52, Jo-Philipp Wich wrote: What should I do in order to have also a KXXfoo link? Define STOP=nn where nn is an integer between 00 and 99. That was easy. Thanks. ~ Jow R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Upgrade mjpeg-streamer
ping On 14/09/2011 14:42, Roberto Riggio wrote: This patch upgrades the mjpeg-streamer package to the latest svn revision. It also closes track entry #9896 since the newer version moved to v4l2. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Update mjpeg-streamer package
It works fine for me on x86 and ixp4xx. I'm using a logitech sphere (the controls work fine too) and another cheap logitec cam (I do not remember the model). R. On 16/09/2011 06:50, Otto Solares Cabrera wrote: On Tue, Sep 13, 2011 at 08:20:45AM +0200, Roberto Riggio wrote: It is the output of svn diff. Rev 150 was from the experimental branch so I was not sure how stable it was (considering the mjpeg streamer is pretty volatile). Just FYI I was having problems in many cams with stable and experimental r150 coupled with Linux 2.6.39 or 3.0 fixed my problems in ar71xx devices so IMO is worth a shot if you have issues. - Otto ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Upgrade mjpeg-streamer
This patch upgrades the mjpeg-streamer package to the latest svn revision. It also closes track entry #9896 since the newer version moved to v4l2. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org Index: multimedia/mjpg-streamer/Makefile === --- multimedia/mjpg-streamer/Makefile (revision 28237) +++ multimedia/mjpg-streamer/Makefile (working copy) @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mjpg-streamer -PKG_REV:=136 +PKG_REV:=148 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -24,7 +24,7 @@ SECTION:=multimedia CATEGORY:=Multimedia TITLE:=MJPG-streamer - DEPENDS:=@!LINUX_2_4 +libpthread +libjpeg + DEPENDS:=+libpthread +libjpeg URL:=http://mjpg-streamer.wiki.sourceforge.net/ endef @@ -42,8 +42,8 @@ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/mjpg-streamer.init $(1)/etc/init.d/mjpg-streamer $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(foreach input_plugin,file uvc gspcav1,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(1)/usr/lib - $(CP) $(foreach output_plugin,http file autofocus,$(PKG_BUILD_DIR)/output_$(output_plugin).so) $(1)/usr/lib + $(CP) $(foreach input_plugin,file uvc,$(PKG_BUILD_DIR)/plugins/input_$(input_plugin)/input_$(input_plugin).so) $(1)/usr/lib + $(CP) $(foreach output_plugin,http file,$(PKG_BUILD_DIR)/plugins/output_$(output_plugin)/output_$(output_plugin).so) $(1)/usr/lib $(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Update mjpeg-streamer package
It is the output of svn diff. Rev 150 was from the experimental branch so I was not sure how stable it was (considering the mjpeg streamer is pretty volatile). R. On 13/09/2011 02:52, Otto Solares Cabrera wrote: On Thu, Sep 08, 2011 at 10:31:31AM +0200, Roberto Riggio wrote: This patch upgrades the mjpeg-streamer package to the latest svn revision. It also closes track entry #9896 in the the newer version moved to v4l2. This patch it doesn't apply. mjpg-streamer r150 works for me too. - Otto ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Update mjpeg-streamer package
This patch upgrades the mjpeg-streamer package to the latest svn revision. It also closes track entry #9896 in the the newer version moved to v4l2. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: multimedia/mjpg-streamer/Makefile === --- multimedia/mjpg-streamer/Makefile (revision 28194) +++ multimedia/mjpg-streamer/Makefile (working copy) @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mjpg-streamer -PKG_REV:=136 +PKG_REV:=148 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -24,7 +24,7 @@ SECTION:=multimedia CATEGORY:=Multimedia TITLE:=MJPG-streamer - DEPENDS:=@!LINUX_2_4 +libpthread +libjpeg + DEPENDS:=+libpthread +libjpeg URL:=http://mjpg-streamer.wiki.sourceforge.net/ endef @@ -42,8 +42,8 @@ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/mjpg-streamer.init $(1)/etc/init.d/mjpg-streamer $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(foreach input_plugin,file uvc gspcav1,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(1)/usr/lib - $(CP) $(foreach output_plugin,http file autofocus,$(PKG_BUILD_DIR)/output_$(output_plugin).so) $(1)/usr/lib + $(CP) $(foreach input_plugin,file uvc,$(PKG_BUILD_DIR)/plugins/input_$(input_plugin)/input_$(input_plugin).so) $(1)/usr/lib + $(CP) $(foreach output_plugin,http file,$(PKG_BUILD_DIR)/plugins/output_$(output_plugin)/output_$(output_plugin).so) $(1)/usr/lib $(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Mjpeg-streamer
mjpeg-streamer is broken on newer kernels. a patch has already been submitted to trac; https://dev.openwrt.org/ticket/9896 could somebody commit it? R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Mjpeg-streamer
On 31/08/2011 14:31, Jonas Gorski wrote: On 31 August 2011 14:17, Roberto Riggioroberto.rig...@create-net.org wrote: mjpeg-streamer is broken on newer kernels. a patch has already been submitted to trac; https://dev.openwrt.org/ticket/9896 could somebody commit it? The problem is this will break brcm-2.4 since 2.4 doesn't have v4l2. Wasn't 2.4 dropped? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New package simplejson
Ping On 25/08/2011 13:01, Roberto Riggio wrote: THe simplejson is a json encoder/decoder for python it is a lot faster (close to 10x) than the json module that ships with python. A special thanks to Jan Willies for the feedback on the distribute package. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Porting simplejson to openwrt
Hi, I'm trying to port the simplejson to openwrt (It seem that simplejson is a LOT faster than the version of json shipped with python). I created a new package starting from the jsonpath package. However after running make I get this: --- This script requires setuptools version 0.6c11 to run (even to display help). I will attempt to download it for you (from http://pypi.python.org/packages/2.6/s/setuptools/), but you may need to enable firewall access for this script first. I will start the download in 15 seconds. (Note: if this machine does not have network access, please obtain the file http://pypi.python.org/packages/2.6/s/setuptools/setuptools-0.6c11-py2.6.egg and place it in this directory before rerunning this script.) --- Which is the version of setuptools shipped with openwrt? Any hints to address the problem? R. -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New package simplejson
THe simplejson is a json encoder/decoder for python it is a lot faster (close to 10x) than the json module that ships with python. A special thanks to Jan Willies for the feedback on the distribute package. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: lang/simplejson/Makefile === --- lang/simplejson/Makefile(revision 0) +++ lang/simplejson/Makefile(revision 0) @@ -0,0 +1,46 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=simplejson +PKG_VERSION:=2.1.6 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/ +PKG_MD5SUM:=2f8351f6e6fe7ef25744805dfa56c0d5 +PKG_BUILD_DEPENDS:=python + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python-package.mk) + +define Package/simplejson + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Simple, fast, extensible JSON encoder/decoder for Python + URL:=http://simplejson.readthedocs.org/ + DEPENDS:=+python +distribute +endef + +define Package/simplejson/description + Simple, fast, extensible JSON encoder/decoder for Python +endef + +define Build/Compile + $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) +endef + +define Package/simplejson/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ + $(1)$(PYTHON_PKG_DIR) +endef + +$(eval $(call BuildPackage,simplejson)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Update wing package
This patch updates the wing package to the latest git version and
moves the package the the new Routing and redirection submenu.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 27944)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -107,7 +107,9 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
ifconfig $iface $ipaddr netmask $netmask
- route add default dev $iface
+ route -n | grep -q '^0.0.0.0' || {
+ route add default dev $iface
+ }
uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
Index: net/wing/files/etc/uci-defaults/wing
===
--- net/wing/files/etc/uci-defaults/wing(revision 27944)
+++ net/wing/files/etc/uci-defaults/wing(working copy)
@@ -1,13 +1,6 @@
uci delete network.mesh
uci set network.mesh=interface
uci set network.mesh.proto=wing
-uci set network.mesh.rc=minstrel
-uci set network.mesh.ls=fcfs
-uci set network.mesh.metric=wcett
-uci set network.mesh.prefix=6
-uci set network.mesh.period=1
-uci set network.mesh.tau=10
-uci set network.mesh.debug=false
uci add firewall zone
uci set firewall.@zone[-1].name=mesh
Index: net/wing/Makefile
===
--- net/wing/Makefile (revision 27944)
+++ net/wing/Makefile (working copy)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20110709
+PKG_VERSION:=20110810
PKG_RELEASE:=1
-PKG_REV:=6aaea18b8e199781dc600681882cb2648f43ec38
+PKG_REV:=99908ec99f1539302f6c3cbbe3e189b5df577bc0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://github.com/rriggio/click.git
@@ -24,12 +24,13 @@
include $(INCLUDE_DIR)/host-build.mk
define Package/wing
- TITLE:=Wireless mesh networking toolkit
- SECTION:=net
- CATEGORY:=Network
- MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
- DEPENDS:=+kmod-tun +libpcap +libstdcpp
- URL:=http://www.wing-project.org/
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=Routing and Redirection
+ TITLE:=Wireless mesh networking toolkit
+ MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
+ DEPENDS:=+kmod-tun +libpcap +libstdcpp
+ URL:=http://www.wing-project.org/
endef
define Package/wing/Description
@@ -44,12 +45,16 @@
--enable-tools=host \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
--disable-dynamic-linking \
HOST_CONFIGURE_ARGS += \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
define Host/Compile
@@ -62,6 +67,7 @@
-f $(PKG_BUILD_DIR)/conf/wing/sample.click \
-A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \
-E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \
+ -E AggregateWingPacketType -E AggregateCounter \
-E RadiotapEncapHT -E SetTXRateHT \
-E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \
-E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Maintainer for package wing
Hi, I would like to be the maintainer for the package wing. What should I do? I already have access to trac, but not to the svn. What should I do to get svn access to the packages repo? Thanks -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Upgrade wing package
Upgrade the Wing package
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 27574)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -49,6 +49,7 @@
local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F:
'{printf 0x%s 0x%s 0x%s,$4,$5,$6}'))
+ local bcast=$prefix.255.255.255
local netmask=255.0.0.0
if ! wing_template_available profile $profile; then
@@ -77,6 +78,7 @@
-m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
| sed -e s/__XR_IFNAME__/$iface/g \
| sed -e s/__XR_IP__/$ipaddr/g \
+ | sed -e s/__XR_BCAST__/$bcast/g \
| sed -e s/__XR_NM__/$netmask/g \
| sed -e s/__XR_PERIOD__/$period/g \
| sed -e s/__XR_TAU__/$tau/g /tmp/$iface.click
@@ -104,9 +106,13 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
- ifconfig $iface $ipaddr netmask $netmask
+ ifconfig $iface $ipaddr netmask $netmask
+ route add default dev $iface
+
+ uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
uci_set_state network $config netmask $netmask
+ uci_set_state network $config gateway 0.0.0.0
env -i ACTION=ifup INTERFACE=$config DEVICE=$iface PROTO=wing
/sbin/hotplug-call iface
Index: net/wing/files/usr/bin/wing_status
===
--- net/wing/files/usr/bin/wing_status (revision 0)
+++ net/wing/files/usr/bin/wing_status (revision 0)
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Copyright (c) 2006, Roberto Riggio
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# - Neither the name of the CREATE-NET nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ROUTES=0
+STATIC=0
+HOSTS=0
+LINKS=0
+ARP=0
+GATEWAY=0
+PROBES=0
+
+show_status() {
+
+ [ $ROUTES = 1 ] {
+ printf Routes:\n
+ write_handler lt.dijkstra true
+ read_handler lt.routes
+ }
+
+ [ $STATIC = 1 ] {
+ printf \nStatic Routes:\n
+ read_handler wr/querier.static_routes
+ }
+
+ [ $HOSTS = 1 ] {
+ printf \nIP:\n
+ read_handler lt.ip
+ printf \nHosts:\n
+ read_handler lt.hosts
+ }
+
+ [ $LINKS = 1 ] {
+ printf \nLinks:\n
+ read_handler lt.links
+ }
+
+ [ $ARP = 1 ] {
+ printf \nARP Table:\n
+ read_handler arp.table
+ }
+
+ [ $GATEWAY = 1 ] {
+ printf \nBest gateway:\n
+ read_handler wr/set_gateway.gateway
+ printf \nGateways:\n
+ read_handler wr/gw.gateway_stats
+ printf \nHNAs:\n
+ read_handler wr/gw.hnas
+ }
+
+ [ $PROBES = 1 ] {
+ interfaces=$(read_handler lt.interfaces)
+ for interface in $interfaces; do
+ printf \nBroadcast statistics ($interface):\n
+ read_handler wr/es/es_$interface.bcast_stats
+ done
+ }
+
+ exit 0
+
+}
+
+if [ $# -eq 0 ]; then
+ ROUTES=1
+ STATIC=1
+ HOSTS=1
+ LINKS=1
+ ARP=1
+ GATEWAY=1
+ PROBES=1
+fi
+
+while getopts rshlagp OPTVAL
+do
Re: [OpenWrt-Devel] [PATCH v2] New package jsonpath
ping Il 29/06/2011 09:52, Roberto Riggio ha scritto: This patch adds a new python package called jsonpath. JSONPath allows you to run XPATH-like queries over json data structures. Changes since v1: * removed unrelated changes * fix copyright Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] New package jsonpath
Il 03/07/2011 21:22, John Crispin ha scritto: next time use something more descriptive for title please + TITLE:=jsonpath is not very descriptive well that;s the name of the corresponding python package. If i was looking for it everything else after the name would just be irrelevant. anyway, if this if this is convention for openwrt I'll follow it in the future. thx, blogic On 03/07/11 20:22, Roberto Riggio wrote: ping Il 29/06/2011 09:52, Roberto Riggio ha scritto: This patch adds a new python package called jsonpath. JSONPath allows you to run XPATH-like queries over json data structures. Changes since v1: * removed unrelated changes * fix copyright Signed-off-by: Roberto Riggioroberto.rig...@create-net.org ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2] New package jsonpath
This patch adds a new python package called jsonpath. JSONPath allows you to run XPATH-like queries over json data structures. Changes since v1: * removed unrelated changes * fix copyright Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: lang/jsonpath/Makefile === --- lang/jsonpath/Makefile (revision 0) +++ lang/jsonpath/Makefile (revision 0) @@ -0,0 +1,46 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=jsonpath +PKG_VERSION:=0.52.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.ultimate.com/phil/python/download/ +PKG_MD5SUM:=4cd0c3a70acbc67d2915d64f132cdb4f +PKG_BUILD_DEPENDS:=python + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python-package.mk) + +define Package/jsonpath + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=jsonpath + URL:=http://goessner.net/articles/JsonPath/ + DEPENDS:=+python +endef + +define Package/jsonpath/description + An XPath implementation for JSON +endef + +define Build/Compile + $(call Build/Compile/PyMod,,install --prefix=$(PKG_INSTALL_DIR)/usr) +endef + +define Package/jsonpath/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ + $(1)$(PYTHON_PKG_DIR) +endef + +$(eval $(call BuildPackage,jsonpath)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATH] New package jsonpath
This patch adds a new python package called jsonpath.
JSONPath allows you to run XPATH-like queries over json
structures.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
---
Index: lang/jsonpath/Makefile
===
--- lang/jsonpath/Makefile (revision 0)
+++ lang/jsonpath/Makefile (revision 0)
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=jsonpath
+PKG_VERSION:=0.52.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.ultimate.com/phil/python/download/
+PKG_MD5SUM:=4cd0c3a70acbc67d2915d64f132cdb4f
+PKG_BUILD_DEPENDS:=python
+
+include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
+define Package/jsonpath
+ SUBMENU:=Python
+ SECTION:=lang
+ CATEGORY:=Languages
+ TITLE:=jsonpath
+ URL:=http://goessner.net/articles/JsonPath/
+ DEPENDS:=+python
+endef
+
+define Package/jsonpath/description
+ An XPath implementation for JSON
+endef
+
+define Build/Compile
+ $(call Build/Compile/PyMod,,install --prefix=$(PKG_INSTALL_DIR)/usr)
+endef
+
+define Package/jsonpath/install
+ $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+ $(CP) \
+ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
+ $(1)$(PYTHON_PKG_DIR)
+endef
+
+$(eval $(call BuildPackage,jsonpath))
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 27260)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -49,6 +49,7 @@
local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F:
'{printf 0x%s 0x%s 0x%s,$4,$5,$6}'))
+ local bcast=$prefix.255.255.255
local netmask=255.0.0.0
if ! wing_template_available profile $profile; then
@@ -77,6 +78,7 @@
-m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
| sed -e s/__XR_IFNAME__/$iface/g \
| sed -e s/__XR_IP__/$ipaddr/g \
+ | sed -e s/__XR_BCAST__/$bcast/g \
| sed -e s/__XR_NM__/$netmask/g \
| sed -e s/__XR_PERIOD__/$period/g \
| sed -e s/__XR_TAU__/$tau/g /tmp/$iface.click
@@ -104,9 +106,13 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
- ifconfig $iface $ipaddr netmask $netmask
+ ifconfig $iface $ipaddr netmask $netmask
+ route add default dev $iface
+
+ uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
uci_set_state network $config netmask $netmask
+ uci_set_state network $config gateway 0.0.0.0
env -i ACTION=ifup INTERFACE=$config DEVICE=$iface PROTO=wing
/sbin/hotplug-call iface
Index: net/wing/files/usr/bin/wing_status
===
--- net/wing/files/usr/bin/wing_status (revision 0)
+++ net/wing/files/usr/bin/wing_status (revision 0)
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Copyright (c) 2006, Roberto Riggio
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# - Neither the name of the CREATE-NET nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ROUTES=0
+STATIC=0
+HOSTS=0
+LINKS=0
+ARP=0
+GATEWAY=0
+PROBES=0
+
+show_status() {
+
+ [ $ROUTES = 1 ] {
+ printf Routes:\n
Re: [OpenWrt-Devel] [PATCH] Upgrade wing package
I'm attaching a new version of the patch.
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: files/lib/network/wing.sh
===
--- files/lib/network/wing.sh(revision 27241)
+++ files/lib/network/wing.sh(working copy)
@@ -49,6 +49,7 @@
local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F:
'{printf 0x%s 0x%s 0x%s,$4,$5,$6}'))
+local bcast=$prefix.255.255.255
local netmask=255.0.0.0
if ! wing_template_available profile $profile; then
@@ -77,6 +78,7 @@
-m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
| sed -e s/__XR_IFNAME__/$iface/g \
| sed -e s/__XR_IP__/$ipaddr/g \
+| sed -e s/__XR_BCAST__/$bcast/g \
| sed -e s/__XR_NM__/$netmask/g \
| sed -e s/__XR_PERIOD__/$period/g \
| sed -e s/__XR_TAU__/$tau/g /tmp/$iface.click
@@ -104,9 +106,13 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
-ifconfig $iface $ipaddr netmask $netmask
+ifconfig $iface $ipaddr netmask $netmask
+route add default dev $iface
+
+uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
uci_set_state network $config netmask $netmask
+uci_set_state network $config gateway 0.0.0.0
env -i ACTION=ifup INTERFACE=$config DEVICE=$iface
PROTO=wing /sbin/hotplug-call iface
Index: files/usr/bin/wing_status
===
--- files/usr/bin/wing_status(revision 0)
+++ files/usr/bin/wing_status(revision 0)
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Copyright (c) 2006, Roberto Riggio
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# - Neither the name of the CREATE-NET nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ROUTES=0
+STATIC=0
+HOSTS=0
+LINKS=0
+ARP=0
+GATEWAY=0
+PROBES=0
+
+show_status() {
+
+[ $ROUTES = 1 ] {
+printf Routes:\n
+write_handler lt.dijkstra true
+read_handler lt.routes
+}
+
+[ $STATIC = 1 ] {
+printf \nStatic Routes:\n
+read_handler wr/querier.static_routes
+}
+
+[ $HOSTS = 1 ] {
+printf \nIP:\n
+read_handler lt.ip
+printf \nHosts:\n
+read_handler lt.hosts
+}
+
+[ $LINKS = 1 ] {
+printf \nLinks:\n
+read_handler lt.links
+}
+
+[ $ARP = 1 ] {
+printf \nARP Table:\n
+read_handler arp.table
+}
+
+[ $GATEWAY = 1 ] {
+printf \nBest gateway:\n
+read_handler wr/set_gateway.gateway
+printf \nGateways:\n
+read_handler wr/gw.gateway_stats
+printf \nHNAs:\n
+read_handler wr/gw.hnas
+}
+
+[ $PROBES = 1 ] {
+interfaces=$(read_handler lt.interfaces)
+for interface in $interfaces; do
+printf \nBroadcast statistics ($interface):\n
+read_handler wr/es/es_$interface.bcast_stats
+done
+}
+
+exit 0
+
+}
+
+if [ $# -eq 0 ]; then
+ROUTES=1
+STATIC=1
+HOSTS=1
+LINKS=1
+ARP=1
+GATEWAY=1
+PROBES=1
+fi
+
+while getopts rshlagp OPTVAL
+do
+case $OPTVAL in
+r) ROUTES=1
+ ;;
+r) STATIC=1
+ ;;
+h) HOSTS=1
+ ;;
+l) LINKS=1
+ ;;
+a) ARP=1
+ ;;
+g) GATEWAY=1
+ ;;
+p) PROBES=1
+ ;;
+*) ROUTES=1; STATIC=1; HOSTS=1; LINKS=1; ARP=1; GATEWAY=1; PROBES=1
+ ;;
+esac
+done
+
+show_status
Property changes
[OpenWrt-Devel] [PATCH] Upgrade wing package
Upgrades the Wing Wireless Mesh Networking Daemon to the latest version. The
main
change is the support for link-level broadcasts.
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 27180)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -49,6 +49,7 @@
local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F: '{printf
0x%s 0x%s 0x%s,$4,$5,$6}'))
+ local bcast=$prefix.255.255.255
local netmask=255.0.0.0
if ! wing_template_available profile $profile; then
@@ -77,6 +78,7 @@
-m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
| sed -e s/__XR_IFNAME__/$iface/g \
| sed -e s/__XR_IP__/$ipaddr/g \
+ | sed -e s/__XR_BCAST__/$bcast/g \
| sed -e s/__XR_NM__/$netmask/g \
| sed -e s/__XR_PERIOD__/$period/g \
| sed -e s/__XR_TAU__/$tau/g /tmp/$iface.click
@@ -104,9 +106,13 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
- ifconfig $iface $ipaddr netmask $netmask
+ ifconfig $iface $ipaddr netmask $netmask
+ route add default dev $iface
+
+ uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
uci_set_state network $config netmask $netmask
+ uci_set_state network $config gateway 0.0.0.0
env -i ACTION=ifup INTERFACE=$config DEVICE=$iface PROTO=wing
/sbin/hotplug-call iface
Index: net/wing/files/usr/bin/wing_status
===
--- net/wing/files/usr/bin/wing_status (revision 0)
+++ net/wing/files/usr/bin/wing_status (revision 0)
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Copyright (c) 2006, Roberto Riggio
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# - Neither the name of the CREATE-NET nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ROUTES=0
+STATIC=0
+HOSTS=0
+LINKS=0
+ARP=0
+GATEWAY=0
+PROBES=0
+
+show_status() {
+
+ [ $ROUTES = 1 ] {
+ printf Routes:\n
+ write_handler lt.dijkstra true
+ read_handler lt.routes
+ }
+
+ [ $STATIC = 1 ] {
+ printf \nStatic Routes:\n
+ read_handler wr/querier.static_routes
+ }
+
+ [ $HOSTS = 1 ] {
+ printf \nIP:\n
+ read_handler lt.ip
+ printf \nHosts:\n
+ read_handler lt.hosts
+ }
+
+ [ $LINKS = 1 ] {
+ printf \nLinks:\n
+ read_handler lt.links
+ }
+
+ [ $ARP = 1 ] {
+ printf \nARP Table:\n
+ read_handler arp.table
+ }
+
+ [ $GATEWAY = 1 ] {
+ printf \nBest gateway:\n
+ read_handler wr/set_gateway.gateway
+ printf \nGateways:\n
+ read_handler wr/gw.gateway_stats
+ printf \nHNAs:\n
+ read_handler wr/gw.hnas
+ }
+
+ [ $PROBES = 1 ] {
+ interfaces=$(read_handler lt.interfaces)
+ for interface in $interfaces; do
+ printf \nBroadcast statistics ($interface):\n
+ read_handler wr/es/es_$interface.bcast_stats
+ done
+ }
+
+ exit 0
+
+}
+
+if [ $# -eq 0 ]; then
+ ROUTES=1
+ STATIC=1
[OpenWrt-Devel] Adding entry to /etc/hosts
Hi, which is the openwrt way to have a particular package to add an entry to /etc/hosts at build or install time? Is it ok to add an echo into a uci-defaults file? R. -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Adding entry to /etc/hosts
Hi, I would like to have a new entry like: 127.0.0.1 my_name after a package is installed. the package that i'm installing actually runs an embedded web server. In this way if I'm attached to the router using the lan I can point the browser to http://my_name/ instead of http://10.0.0.1/ R. Il 10/06/2011 13:59, John Crispin ha scritto: On 10/06/11 13:56, Roberto Riggio wrote: Hi, which is the openwrt way to have a particular package to add an entry to /etc/hosts at build or install time? Is it ok to add an echo into a uci-defaults file? R. hi Roberto, can you give an exymple of where you want to do this ? John ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/1] alix2: add UCI files for network and wireless
Il 05/06/2011 07:47, Philip Prindeville ha scritto: I'm not sure there are any Alix's currently in production with 2 miniPCI slots, or if there ever have been. I do have several alix2 boards with 2 minipci slots (both equipped with two wifi cards). and 2 ethernet ports. -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Upgrade Wing package
This patch updates the Wing package to the latest Git version
which includes several bug fixes. The patch adds also a script
wing_status which can be used to dump some information about
the routing daemon (links, routes, statistics about the probes, etc.)
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 26910)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -104,9 +104,13 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}'
/var/run/$iface.pid
- ifconfig $iface $ipaddr netmask $netmask
+ ifconfig $iface $ipaddr netmask $netmask
+ route add default dev $iface
+
+ uci_set_state network $config ifname $iface
uci_set_state network $config ipaddr $ipaddr
uci_set_state network $config netmask $netmask
+ uci_set_state network $config gateway 0.0.0.0
env -i ACTION=ifup INTERFACE=$config DEVICE=$iface PROTO=wing
/sbin/hotplug-call iface
Index: net/wing/files/usr/bin/wing_status
===
--- net/wing/files/usr/bin/wing_status (revision 0)
+++ net/wing/files/usr/bin/wing_status (revision 0)
@@ -0,0 +1,124 @@
+#!/bin/sh
+
+# Copyright (c) 2006, Roberto Riggio
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# - Neither the name of the CREATE-NET nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ROUTES=0
+STATIC=0
+HOSTS=0
+LINKS=0
+ARP=0
+GATEWAY=0
+PROBES=0
+
+show_status() {
+
+ [ $ROUTES = 1 ] {
+ printf Routes:\n
+ write_handler lt.dijkstra true
+ read_handler lt.routes
+ }
+
+ [ $STATIC = 1 ] {
+ printf \nStatic Routes:\n
+ read_handler wr/querier.static_routes
+ }
+
+ [ $HOSTS = 1 ] {
+ printf \nIP:\n
+ read_handler lt.ip
+ printf \nHosts:\n
+ read_handler lt.hosts
+ }
+
+ [ $LINKS = 1 ] {
+ printf \nLinks:\n
+ read_handler lt.links
+ }
+
+ [ $ARP = 1 ] {
+ printf \nARP Table:\n
+ read_handler arp.table
+ }
+
+ [ $GATEWAY = 1 ] {
+ printf \nBest gateway:\n
+ read_handler wr/set_gateway.gateway
+ printf \nGateways:\n
+ read_handler wr/gw.gateway_stats
+ printf \nHNAs:\n
+ read_handler wr/gw.hnas
+ }
+
+ [ $PROBES = 1 ] {
+ interfaces=$(read_handler lt.interfaces)
+ for interface in $interfaces; do
+ printf \nBroadcast statistics ($interface):\n
+ read_handler wr/es/es_$interface.bcast_stats
+ done
+ }
+
+ exit 0
+
+}
+
+if [ $# -eq 0 ]; then
+ ROUTES=1
+ STATIC=1
+ HOSTS=1
+ LINKS=1
+ ARP=1
+ GATEWAY=1
+ PROBES=1
+fi
+
+while getopts rshlagp OPTVAL
+do
+ case $OPTVAL in
+ r) ROUTES=1
+ ;;
+ r) STATIC=1
+ ;;
+ h) HOSTS=1
+ ;;
+ l) LINKS=1
+ ;;
+ a) ARP=1
+ ;;
+ g) GATEWAY=1
+ ;;
+ p) PROBES=1
+ ;;
+ *) ROUTES=1; STATIC=1; HOSTS=1; LINKS=1; ARP=1; GATEWAY=1; PROBES=1
+ ;;
+ esac
+done
+
+show_status
Property changes on: net/wing/files/usr/bin/wing_status
Re: [OpenWrt-Devel] mac80211 packet injection with rate setting
Did you have any luck with 11n cards (e.g. using the ath9k driver)?
i mixed the Pavel Roskin patch with another in order to support
11n rates, but I'm having some troubles injecting traffic. The patch
is here:
http://gforge.create-net.org/gf/project/wing/scmsvn/?action=browsepath=%2F%2Acheckout%2A%2Ftrunk%2Fpatches%2Fpackage%2Fmac80211%2Fpatches%2F890-radiotap_rate.patch
If you have the possibility/time could you test it?
Il 10/05/2011 14:52, Paweł Foremski ha scritto:
Hello, below is a patch by Pavel Roskin [1] which allows for choosing
frame bit rate and retry count in injected frames. I've reformatted it
to match compat-wireless of openwrt trunk@26460 (git
020dd72982225bf36072130046c88c3fdab12811). I find it very useful for
my needs, you may want to consider importing.
[1] http://article.gmane.org/gmane.linux.kernel.wireless.general/47441
diff -urN a/include/net/mac80211.h b/include/net/mac80211.h
--- a/include/net/mac80211.h2011-04-04 10:19:31.269159064 +0200
+++ b/include/net/mac80211.h2011-05-10 13:24:34.520866984 +0200
@@ -344,6 +344,7 @@
* @IEEE80211_TX_INTFL_TKIP_MIC_FAILURE: Marks this packet to be used for TKIP
*testing. It will be sent out with incorrect Michael MIC key to allow
*TKIP countermeasures to be tested.
+ * @IEEE80211_TX_CTL_RC_BYPASS: Don't use rate control on the frame.
*
* Note: If you have to add new flags to the enumeration, then don't
* forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.
@@ -374,6 +375,7 @@
IEEE80211_TX_CTL_STBC = BIT(23) | BIT(24),
IEEE80211_TX_CTL_TX_OFFCHAN = BIT(25),
IEEE80211_TX_INTFL_TKIP_MIC_FAILURE = BIT(26),
+ IEEE80211_TX_CTL_RC_BYPASS = BIT(27),
};
#define IEEE80211_TX_CTL_STBC_SHIFT 23
diff -urN a/net/mac80211/tx.c b/net/mac80211/tx.c
--- a/net/mac80211/tx.c 2011-03-25 21:43:25.0 +0100
+++ b/net/mac80211/tx.c 2011-05-10 13:28:11.096866864 +0200
@@ -1091,6 +1091,39 @@
tx-flags |= IEEE80211_TX_FRAGMENTED;
break;
+ case IEEE80211_RADIOTAP_RATE: {
+ int i, idx = -1;
+ int rate = *iterator.this_arg * 5;
+
+ for (i = 0; i sband-n_bitrates; i++)
+ if (sband-bitrates[i].bitrate == rate) {
+ idx = i;
+ break;
+ }
+
+ /* Rate not available - rejecting */
+ if (idx 0)
+ return false;
+
+ info-flags |= IEEE80211_TX_CTL_RC_BYPASS;
+ info-control.rates[0].idx = idx;
+ info-control.rates[0].count = 1;
+ for (i = 1; i IEEE80211_TX_MAX_RATES; i++)
+ info-control.rates[i].idx = -1;
+ break;
+ }
+
+ case IEEE80211_RADIOTAP_DATA_RETRIES:
+ /*
+* Only allow setting the number of retries in
+* conjunction with the rates, when the rate control
+* is bypassed.
+*/
+ if (info-flags IEEE80211_TX_CTL_RC_BYPASS)
+ info-control.rates[0].count =
+ *iterator.this_arg;
+ break;
+
/*
* Please update the file
* Documentation/networking/mac80211-injection.txt
@@ -1397,7 +1430,8 @@
CALL_TXH(ieee80211_tx_h_ps_buf);
CALL_TXH(ieee80211_tx_h_check_control_port_protocol);
CALL_TXH(ieee80211_tx_h_select_key);
- if (!(tx-local-hw.flags IEEE80211_HW_HAS_RATE_CONTROL))
+ if (!(tx-local-hw.flags IEEE80211_HW_HAS_RATE_CONTROL)
+ !(info-flags IEEE80211_TX_CTL_RC_BYPASS))
CALL_TXH(ieee80211_tx_h_rate_ctrl);
if (unlikely(info-flags IEEE80211_TX_INTFL_RETRANSMISSION))
---
Paweł Foremski
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
--
Roberto Riggio, Ph.D.
CREATE-NET
Network Security Solutions for Pervasive Computing Systems (iNSPIRE)
Senior Researcher
Via alla Cascata 56/D - 38123 Povo Trento (Italy)
e-mail: roberto.rig...@create-net.org
Tel: (+39) 0461 408400 - interno/extension 708
Fax: (+39) 0461 421157
www.create-net.org/~rriggio
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. Any review, retransmission, dissemination or other use of, or
taking
Re: [OpenWrt-Devel] [PATCH] Upgrade wing package to latest version
Upgrades the wing package to the latest version. The most important
changes are:
* revised implementation of the minstrel rate control algorithm
* the openwrt makefile now point to the new repository, the old one
in not available anymore
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh(revision 26355)
+++ net/wing/files/lib/network/wing.sh(working copy)
@@ -36,32 +36,32 @@
exit 1
fi
-local profile rc ls prefix debug
+local profile rc ls metric prefix period tau debug
config_get profile $config profile bulk
-config_get rc $config rc static
+config_get rc $config rc minstrel
config_get ls $config ls fcfs
config_get metric $config metric wcett
config_get prefix $config prefix 6
config_get period $config period 1
config_get tau $config tau 10
-config_get_bool debug $config debug False
+config_get_bool debug $config debug false
local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F:
'{printf 0x%s 0x%s 0x%s,$4,$5,$6}'))
local netmask=255.0.0.0
-if ! wing_template_available profile $profile bulk; then
+if ! wing_template_available profile $profile; then
logger -t $config Unable to configure router. Exiting.
exit 1
fi
-if ! wing_template_available rc $rc static; then
+if ! wing_template_available rc $rc; then
logger -t $config Unable to configure rate control. Exiting.
exit 1
fi
-if ! wing_template_available ls $ls radiotap; then
+if ! wing_template_available ls $ls; then
logger -t $config Unable to configure link scheduler. Exiting.
exit 1
fi
@@ -115,10 +115,7 @@
wing_template_available() { # prefix, template, default
local template=/etc/wing/$1.$2.click
[ ! -f $template ] {
-template=/etc/wing/$1.$3.click
-[ ! -f $template ] {
-return 1
-}
+return 1
}
return 0
}
@@ -131,8 +128,12 @@
config_get ifname $1 ifname
config_get device $1 device
config_get hwmode $device hwmode 11bg
-freq=$(iwlist $ifname freq | grep Current Frequency | sed -n
s/^.*Current Frequency:\([0-9.]*\) GHz (Channel \([0-9]*\))/\1/p | awk
'{print $1*1000}')
-freq=${freq:-0}
+config_get channel $device channel 0
+[ $channel = 0 -o $channel = auto ] {
+logger -t $device Channel not specified. Ignoring.
+return 0
+}
+freq=$(iwlist $ifname freq | sed -n s/^.*Channel 0*$channel :
\([0-9.]*\).*/\1/p | awk '{print $1*1000}')
hwaddr=$(/sbin/ifconfig $ifname 21 | sed -n 's/^.*HWaddr
\([0-9A-Za-z\-]*\).*/\1/p' | sed -e 's/\-/:/g' | cut -c1-17)
freqs=${freqs:+$freqs }$freq
hwmodes=${hwmodes:+$hwmodes }$hwmode
Index: net/wing/files/etc/uci-defaults/wing
===
--- net/wing/files/etc/uci-defaults/wing(revision 26355)
+++ net/wing/files/etc/uci-defaults/wing(working copy)
@@ -1,13 +1,13 @@
uci set network.mesh=interface
uci set network.mesh.proto=wing
uci set network.mesh.profile=bulk
-uci set network.mesh.rc=static
+uci set network.mesh.rc=minstrel
uci set network.mesh.ls=fcfs
uci set network.mesh.metric=wcett
uci set network.mesh.prefix=6
-uci set network.mesh.period=36000
-uci set network.mesh.tau=36
-uci set network.mesh.debug=true
+uci set network.mesh.period=1
+uci set network.mesh.tau=10
+uci set network.mesh.debug=false
cfg=$(uci add firewall zone)
uci set firewall.$cfg.name=mesh
Index: net/wing/Makefile
===
--- net/wing/Makefile(revision 26355)
+++ net/wing/Makefile(working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20101023
+PKG_VERSION:=20110329
PKG_RELEASE:=1
-PKG_REV:=daffb8d7642c4a343951d67159504ff4f4da49ed
+PKG_REV:=5c93a28b13921608750b2b5050a7e58fe3b69901
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://github.com/create-net/click-wing.git
+PKG_SOURCE_URL:=git://github.com/rriggio/click.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=git
@@ -29,7 +29,6 @@
TITLE:=Wireless mesh networking toolkit
SECTION:=net
CATEGORY:=Network
-SUBMENU:=Routing and Redirection
MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
DEPENDS:=+kmod-tun +libpcap +libstdcpp
URL:=http://www.wing-project.org/
@@ -48,12 +47,14 @@
--enable-userlevel \
--enable-wifi \
--enable-wing \
+--enable-diffserv \
--disable-linuxmodule \
--disable-dynamic-linking \
HOST_CONFIGURE_ARGS += \
--enable-userlevel \
--enable-wifi \
+--enable-diffserv \
--enable-wing
Re: [OpenWrt-Devel] [PATCH] Parse RADIOTAP_RTS_RETRIES field in madwifi
any comment/feedback on this? Il 14/03/2011 09:05, Roberto Riggio ha scritto: The RADIOTAP_RTS_RETRIES field is currently not known to the madwifi radiotap parser. The result is that, if this field is present the parsing stops preventing the following field from be processed. This patch adds support for the field, albeit the value is not used in the code, like for many other fields. This patch closes #9027. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: package/madwifi/patches/475_radiotap_rts_retries.patch === --- package/madwifi/patches/475_radiotap_rts_retries.patch (revision 0) +++ package/madwifi/patches/475_radiotap_rts_retries.patch (revision 0) @@ -0,0 +1,12 @@ +diff -urN madwifi-trunk-r3314/net80211/ieee80211_monitor.c madwifi-trunk-r3314.new//net80211/ieee80211_monitor.c +--- madwifi-trunk-r3314/net80211/ieee80211_monitor.c 2011-03-11 09:56:32.0 +0100 madwifi-trunk-r3314.new//net80211/ieee80211_monitor.c 2011-03-14 08:59:09.669267001 +0100 +@@ -220,6 +220,8 @@ + case IEEE80211_RADIOTAP_ANTENNA: + case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: + case IEEE80211_RADIOTAP_DBM_ANTNOISE: ++ case IEEE80211_RADIOTAP_RTS_RETRIES: ++ + /* 8-bit */ + p++; + break; ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Roberto Riggio, Ph.D. CREATE-NET Network Security Solutions for Pervasive Computing Systems (iNSPIRE) Senior Researcher Via alla Cascata 56/D - 38123 Povo Trento (Italy) e-mail: roberto.rig...@create-net.org Tel: (+39) 0461 408400 - interno/extension 708 Fax: (+39) 0461 421157 www.create-net.org/~rriggio The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited according to the Italian Law 196/2003 of the Legislature. If you received this in error, please contact the sender and delete the material from any computer. Le informazioni contenute in questo messaggio di posta elettronica e nei file allegati sono da considerarsi strettamente riservate. Il loro utilizzo e' consentito esclusivamente al destinatario del messaggio, per le finalita' indicate nel messaggio stesso. Qualora riceveste questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla cancellazione del messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalita' diverse, costituisce comportamento contrario ai principi dettati dal D. Lgs. 196/2003. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Parse RADIOTAP_RTS_RETRIES field in madwifi
The RADIOTAP_RTS_RETRIES field is currently not known to the madwifi radiotap parser. The result is that, if this field is present the parsing stops preventing the following field from be processed. This patch adds support for the field, albeit the value is not used in the code, like for many other fields. This patch closes #9027. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: package/madwifi/patches/475_radiotap_rts_retries.patch === --- package/madwifi/patches/475_radiotap_rts_retries.patch (revision 0) +++ package/madwifi/patches/475_radiotap_rts_retries.patch (revision 0) @@ -0,0 +1,12 @@ +diff -urN madwifi-trunk-r3314/net80211/ieee80211_monitor.c madwifi-trunk-r3314.new//net80211/ieee80211_monitor.c +--- madwifi-trunk-r3314/net80211/ieee80211_monitor.c 2011-03-11 09:56:32.0 +0100 madwifi-trunk-r3314.new//net80211/ieee80211_monitor.c 2011-03-14 08:59:09.669267001 +0100 +@@ -220,6 +220,8 @@ + case IEEE80211_RADIOTAP_ANTENNA: + case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: + case IEEE80211_RADIOTAP_DBM_ANTNOISE: ++ case IEEE80211_RADIOTAP_RTS_RETRIES: ++ + /* 8-bit */ + p++; + break; ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] new package wattsup
This patch adds a command line utility to interface with the WattsUp
power meters (https://www.wattsupmeters.com/)
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
--
Index: utils/wattsup/src/wattsup.c
===
--- utils/wattsup/src/wattsup.c (revision 0)
+++ utils/wattsup/src/wattsup.c (revision 0)
@@ -0,0 +1,1877 @@
+/*
+ * wattsup - Program for controlling the Watts Up? Pro Device
+ *
+ *
+ * Copyright (c) 2005 Patrick Mochel
+ *
+ * This program is released under the GPLv2
+ *
+ *
+ * Compiled with:
+ *
+ * gcc -O2 -Wall -o wattsup wattsup.c
+ *
+ */
+
+#define _GNU_SOURCE
+#includestdio.h
+#includestdlib.h
+#includestdarg.h
+#includestring.h
+#includeerrno.h
+#includeunistd.h
+#includefcntl.h
+#includetermios.h
+#includectype.h
+#includegetopt.h
+#includesignal.h
+#includetime.h
+
+#includesys/stat.h
+
+static const char * wu_version = 0.02;
+
+
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
+
+static const char * prog_name = wattsup;
+
+static const char * sysfs_path_start = /sys/class/tty;
+
+static char * wu_device = ttyUSB0;
+static int wu_fd = 0;
+static int wu_count = 0;
+static int wu_debug = 0;
+static char *wu_delim = , ;
+static int wu_final = 0;
+static int wu_interval = 1;
+static int wu_label = 0;
+static int wu_newline = 0;
+static int wu_suppress = 0;
+
+static int wu_localtime = 0;
+static int wu_gmtime = 0;
+
+static int wu_info_all = 0;
+static int wu_no_data = 0;
+static int wu_set_only = 0;
+
+#define wu_strlen 256
+#define wu_num_fields 18
+#define wu_param_len 16
+
+struct wu_packet {
+ unsigned intcmd;
+ unsigned intsub_cmd;
+ unsigned intcount;
+ charbuf[wu_strlen];
+ int len;
+ char* field[wu_num_fields];
+ char* label[wu_num_fields];
+};
+
+
+struct wu_data {
+ unsigned intwatts;
+ unsigned intvolts;
+ unsigned intamps;
+ unsigned intwatt_hours;
+
+ unsigned intcost;
+ unsigned intmo_kWh;
+ unsigned intmo_cost;
+ unsigned intmax_watts;
+
+ unsigned intmax_volts;
+ unsigned intmax_amps;
+ unsigned intmin_watts;
+ unsigned intmin_volts;
+
+ unsigned intmin_amps;
+ unsigned intpower_factor;
+ unsigned intduty_cycle;
+ unsigned intpower_cycle;
+};
+
+struct wu_options {
+ char* longopt;
+ int shortopt;
+ int param;
+ int flag;
+ char* value;
+
+ char* descr;
+ char* option;
+ char* format;
+
+ int (*show)(int dev_fd);
+ int (*store)(int dev_fd);
+};
+
+enum {
+ wu_option_help = 0,
+ wu_option_version,
+
+ wu_option_debug,
+
+ wu_option_count,
+ wu_option_final,
+
+ wu_option_delim,
+ wu_option_newline,
+ wu_option_localtime,
+ wu_option_gmtime,
+ wu_option_label,
+
+ wu_option_suppress,
+
+ wu_option_cal,
+ wu_option_header,
+
+ wu_option_interval,
+ wu_option_mode,
+ wu_option_user,
+
+ wu_option_info_all,
+ wu_option_no_data,
+ wu_option_set_only,
+};
+
+
+static char * wu_option_value(unsigned int index);
+
+
+enum {
+ wu_field_watts = 0,
+ wu_field_volts,
+ wu_field_amps,
+
+ wu_field_watt_hours,
+ wu_field_cost,
+ wu_field_mo_kwh,
+ wu_field_mo_cost,
+
+ wu_field_max_watts,
+ wu_field_max_volts,
+ wu_field_max_amps,
+
+ wu_field_min_watts,
+ wu_field_min_volts,
+ wu_field_min_amps,
+
+ wu_field_power_factor,
+ wu_field_duty_cycle,
+ wu_field_power_cycle,
+};
+
+struct wu_field {
+ unsigned intenable;
+ char* name;
+ char* descr;
+};
+
+static struct wu_field wu_fields[wu_num_fields] = {
+ [wu_field_watts]= {
+ .name = watts,
+ .descr = Watt Consumption,
+ },
+
+ [wu_field_min_watts]= {
+ .name = min-watts,
+ .descr = Minimum Watts Consumed,
+ },
+
+ [wu_field_max_watts]= {
+ .name = max-watts,
+ .descr = Maxium Watts Consumed,
+ },
+
+ [wu_field_volts]= {
+ .name = volts,
+ .descr = Volts Consumption,
+ },
+
+ [wu_field_min_volts]= {
+ .name = max-volts,
+ .descr = Minimum Volts Consumed,
+ },
+
+ [wu_field_max_volts]= {
+ .name = min-volts,
+ .descr = Maximum Volts Consumed,
+ },
+
+ [wu_field_amps] = {
+ .name = amps,
+ .descr = Amp Consumption,
+ },
+
+ [wu_field_min_amps] = {
+ .name = min-amps,
+
[OpenWrt-Devel] [PATCH] Defconfig to generic on x86
Hi, I think that the defconfig script should default to generic if no soekris board is found. Also, why by default all the defconfig scripts are copied to the firmware? At the moement on my aliz board I have several soekris-related directory under /etc/defconfig/ Signed-off-by: roberto riggioroberto.rig...@gmail.com -- Index: target/linux/x86/base-files/etc/init.d/defconfig === --- target/linux/x86/base-files/etc/init.d/defconfig(revision 25546) +++ target/linux/x86/base-files/etc/init.d/defconfig(working copy) @@ -10,7 +10,7 @@ local board=$(net48xx_board_name) -[ ! -d /etc/defconfig/$board ] board=net4826 +[ ! -d /etc/defconfig/$board ] board=generic for f in $( ls /etc/defconfig/$board ); do if [ ! -e /etc/config/$f ]; then ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Bump mjpg-streamer revision
Signed-off-by: Roberto Riggio roberto.rig...@gmail.com -- Index: multimedia/mjpg-streamer/Makefile === --- multimedia/mjpg-streamer/Makefile(revision 24227) +++ multimedia/mjpg-streamer/Makefile(working copy) @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mjpg-streamer -PKG_REV:=94 +PKG_REV:=136 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Tracking memory leak in kernel space
Hi, how would you track a memory leak in a kernel module? Is there something equivalent to valgrind for kernel debugging? I'm having some troubles with the openwrt version of the madwifi driver. Basically the occupied memory as reported by the free command increases progressively over time. For example after I boot the router i get this output: total used free shared buffers Mem: 25697231300 225672011480 after let's say 12 hours instead I get: total used free shared buffers Mem: 25697277916 179056049280 I suspected the madwifi driver because I've tried two almost identical configuration, one using the madwifi driver and one using the ath9k driver (with two different wifi card). R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Add device id for 3g dongles (re-submission)
I'm re-submitting the patch with the comments from Jo-Phillip
With some modems the ttyUSBx device/s are not automatically created
after the mode switch (for example with my k3765).
This patch adds a new id for the target device after the mode switch.
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
--
Index: utils/usb-modeswitch/files/modeswitch.hotplug
===
--- utils/usb-modeswitch/files/modeswitch.hotplug(revision 23568)
+++ utils/usb-modeswitch/files/modeswitch.hotplug(working copy)
@@ -2,6 +2,7 @@
local uVid uPid uMa uPr uSe
local sVe sMo sRe
+local tVid tPid
local modeswitch=/usr/bin/usb_modeswitch
@@ -121,6 +122,10 @@
[ -n $configs ] {
log $DEVICENAME: Selecting ${configs%% *} for mode switching
$modeswitch -c ${configs%% *}
+tVid=$(sed -ne 's/TargetVendor[^=]*=\(.*\)/\1/p'
${configs%% *})
+tPid=$(sed -ne 's/TargetProduct[^=]*=\(.*\)/\1/p'
${configs%% *})
+log $DEVICENAME: Adding $tVid $tPid device id to option
driver
+echo $tVid $tPid
/sys/bus/usb-serial/drivers/option1/new_id
}
}
fi
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Split wing compilation into host and target
This patch:
* splits the wing package compilation into host and target
* upgrades the git revision to a more recent version of the protocol
which solves a segfault on arm boards and adds support for OLSR-like
Host-Network-Association messages.
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh(revision 23569)
+++ net/wing/files/lib/network/wing.sh(working copy)
@@ -36,7 +36,7 @@
exit 1
fi
-local profile rc ls prefix debug
+local profile rc ls metric prefix period tau debug
config_get profile $config profile bulk
config_get rc $config rc static
@@ -131,8 +131,12 @@
config_get ifname $1 ifname
config_get device $1 device
config_get hwmode $device hwmode 11bg
-freq=$(iwlist $ifname freq | grep Current Frequency | sed -n
s/^.*Current Frequency:\([0-9.]*\) GHz (Channel \([0-9]*\))/\1/p | awk
'{print $1*1000}')
-freq=${freq:-0}
+config_get channel $device channel 0
+[ $channel = 0 -o $channel = auto ] {
+logger -t $device Channel not specified. Ignoring.
+return 0
+}
+freq=$(iwlist $ifname freq | sed -n s/^.*Channel 0*$channel :
\([0-9.]*\).*/\1/p | awk '{print $1*1000}')
hwaddr=$(/sbin/ifconfig $ifname 21 | sed -n 's/^.*HWaddr
\([0-9A-Za-z\-]*\).*/\1/p' | sed -e 's/\-/:/g' | cut -c1-17)
freqs=${freqs:+$freqs }$freq
hwmodes=${hwmodes:+$hwmodes }$hwmode
Index: net/wing/patches/100-cross-compile.patch
===
--- net/wing/patches/100-cross-compile.patch(revision 23569)
+++ net/wing/patches/100-cross-compile.patch(working copy)
@@ -1,21 +0,0 @@
- m4/click.m4 |8
- 1 file changed, 8 deletions(-)
-
wing-20100903.orig/m4/click.m4
-+++ wing-20100903/m4/click.m4
-@@ -235,14 +235,6 @@ AC_DEFUN([CLICK_CHECK_BUILD_DYNAMIC_LINK
- if test x$ac_build_have_dlopen = xyes -a
x$ac_build_have_dlfcn_h = xyes; then
- ac_build_have_dynamic_linking=yes
- fi
--if test x$ac_build_have_dynamic_linking !=
x$ac_have_dynamic_linking; then
--AC_MSG_ERROR([
--=
--
--Build system and host system don't have the same dynamic linking state!
--
--=])
--fi
- AC_SUBST(BUILD_DL_LIBS)
- eval $saver
- ])
Index: net/wing/Config.in
===
--- net/wing/Config.in(revision 23569)
+++ net/wing/Config.in(working copy)
@@ -1,17 +0,0 @@
-# Wing configuration
-
-choice
-prompt Version
-depends on PACKAGE_wing
-default WING_STABLE
-help
-This option allows you to select the version of Wing to be built.
-
-config WING_STABLE
-bool Use the stable version (multi-interface)
-
-config WING_TESTING
-bool Use the unstable version (multi-interfaces w/ ITACA)
-
-endchoice
-
Index: net/wing/Makefile
===
--- net/wing/Makefile(revision 23569)
+++ net/wing/Makefile(working copy)
@@ -8,17 +8,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
+PKG_VERSION:=20101021
+PKG_RELEASE:=1
+PKG_REV:=402b10c1e914157ee1a105e11390ff013aa00748
-ifneq ($(CONFIG_WING_STABLE),)
-PKG_VERSION:=20100903
-PKG_RELEASE:=4
-PKG_REV:=520e3168a5af4d26bec3779cfa4901d128a4bc6f
-else
-PKG_VERSION:=$(shell date +%Y%m%d)
-PKG_RELEASE:=1
-PKG_REV:=HEAD
-endif
-
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://github.com/create-net/click-wing.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -26,72 +19,58 @@
PKG_SOURCE_PROTO:=git
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=wing/host
+
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
define Package/wing
TITLE:=Wireless mesh networking toolkit
SECTION:=net
CATEGORY:=Network
MAINTAINER:=Roberto Riggio roberto.rig...@create-net.org
-DEPENDS:=+kmod-tun
+DEPENDS:=+kmod-tun +libpcap +libstdcpp
URL:=http://www.wing-project.org/
endef
define Package/wing/Description
Wing is a wireless mesh routing software. The routing protocol
-is derived from Roofnet. It supports multiple radio interfaces and
-link quality routing using the ETX, ETT, and WCETT metrics.
+is derived from Roofnet. It supports multiple radio interfaces
+and link quality routing using the ETX, ETT, or WCETT metric.
endef
-define Package/wing/config
-source $(SOURCE)/Config.in
-endef
+EXTRA_CFLAGS=-MD
-EXTRA_LDFLAGS:=-ldl
+CONFIGURE_ARGS += \
+--enable-tools=host \
+--enable-userlevel \
+--enable-wifi \
+--enable-wing \
+--disable-linuxmodule \
+--disable-dynamic-linking \
-MAKE_FLAGS+=\
-V=1 \
-MINDRIVER
[OpenWrt-Devel] Add target device id for 3g dongles
With some modems the ttyUSBx device are not automatically created
after the modeswitch (for example with my k3765).
This patch adds a new id for the target device after the mode switch.
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
--
Index: utils/usb-modeswitch/files/modeswitch.hotplug
===
--- utils/usb-modeswitch/files/modeswitch.hotplug(revision 23538)
+++ utils/usb-modeswitch/files/modeswitch.hotplug(working copy)
@@ -121,6 +121,10 @@
[ -n $configs ] {
log $DEVICENAME: Selecting ${configs%% *} for mode switching
$modeswitch -c ${configs%% *}
+log $DEVICENAME: Adding $tVid $tPid device id
+tVid=$(cat ${configs%% *} | grep TargetVendor |
sed 's/.*=\(.*\)/\1/')
+tPid=$(cat ${configs%% *} | grep TargetProduct
| sed 's/.*=\(.*\)/\1/')
+echo $tVid $tPid
/sys/bus/usb-serial/drivers/option1/new_id
}
}
fi
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Remove fhonour-copts
Hi Florian, sorry it was a problem on my side. The package I'm trying to compile uses the host environment to compile some execs. The honour-copts was also passed during this ste. I've solved the problem by splitting the compilation in host/target. I will soon post a patch for the package (wing). I'm verifing if everything works fine on architectures different from x86. R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Remove fhonour-copts
Ping... Il 05/10/2010 09:30, Roberto Riggio ha scritto: As suggested by Florian, I'm submitting a patch that removes the honour-copts CFLAG when using an external toolchain. With the flag I'm getting this error when trying to compile a package (the click router): cc1plus: error: unrecognized command line option -fhonour-copts Signed-off-by: Roberto Riggioroberto.rig...@create-net.org -- Index: rules.mk === --- rules.mk(revision 23230) +++ rules.mk(working copy) @@ -113,7 +113,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) -include $(TOOLCHAIN_DIR)/info.mk TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-) -TARGET_CFLAGS+= -fhonour-copts TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include -I$(TOOLCHAIN_DIR)/include TARGET_LDFLAGS+= -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Remove fhonour-copts
Il 11/10/2010 13:30, Florian Fainelli ha scritto: Hello Roberto, Hi I just reviewed this part of the patch, and it is enclosed with an ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) which is evaluated to true, in the case of a non-external toolchain build, so your patch also removes -fhonour-opts for non-external toolchain builds, unless I got this part wrong? Probably I've misunderstood a suggest of yours in a a previous email. I'm not using an external toolchain, however I'm getting this error: cc1plus: error: unrecognized command line option -fhonour-copts when I try to compile a package. The makefile that I'm using is very lightweight: EXTRA_CFLAGS=-MD -fno-stack-protector CONFIGURE_ARGS += \ --enable-userlevel \ --enable-wifi \ --enable-wing \ --disable-linuxmodule \ --disable-dynamic-linking \ and then the default compile and configure. This when building from trunk with either gcc 4.1.2 (the default one) and 4.4.4. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Remove fhonour-copts
Il 11/10/2010 13:59, Florian Fainelli ha scritto: I'm not using an external toolchain, however I'm getting this error: cc1plus: error: unrecognized command line option -fhonour-copts Ok, but that means you have patched your toolchain not to include the - fhonour-opts patch right? No, I haven't patched the toolchain. Where is this patch located? Is it 910-mbsd_multi.patch? If so the patch is there. when I try to compile a package. The makefile that I'm using is very lightweight: EXTRA_CFLAGS=-MD -fno-stack-protector CONFIGURE_ARGS += \ --enable-userlevel \ --enable-wifi \ --enable-wing \ --disable-linuxmodule \ --disable-dynamic-linking \ and then the default compile and configure. This when building from trunk with either gcc 4.1.2 (the default one) and 4.4.4. Unless this is either the fhonour-copts patch missing in gcc-4.4.4 or, a porting bug which prevents its use when -fno-stack-protector, I do not see what is wrong. I've removed the -fnostack-protector and I'm still getting the same error (gcc 4.1.2). -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Disable honour-copts flag
On 10/04/2010 11:39 PM, Florian Fainelli wrote: Hi Roberto, Hi I suppose you are using an external toolchain right? This is something that confuses me. I see from the package-default file that the flag honour-copts is specified only when external toolchain is used. However, I'm using the default openwrt distribution, as a matter of fact the makefile for my package is very simple: EXTRA_CFLAGS=-MD CONFIGURE_ARGS += \ --enable-tools=host \ --enable-userlevel \ --enable-wifi \ --enable-wing \ --disable-linuxmodule \ If using an external toolchain, just do not add -fhonour-copts to the default CFLAGS in rules.mk. Can you prepare a patch doing so? You mean the /rules.mk? Yes I could prepare a patch for this, I did not do this before because I'm not so deep into the openwrt architecture, and such a change looked to me very invasive. Preparing the patch. Thanks -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Remove fhonour-copts
As suggested by Florian, I'm submitting a patch that removes the honour-copts CFLAG when using an external toolchain. With the flag I'm getting this error when trying to compile a package (the click router): cc1plus: error: unrecognized command line option -fhonour-copts Signed-off-by: Roberto Riggioroberto.rig...@create-net.org -- Index: rules.mk === --- rules.mk(revision 23230) +++ rules.mk(working copy) @@ -113,7 +113,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) -include $(TOOLCHAIN_DIR)/info.mk TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-) -TARGET_CFLAGS+= -fhonour-copts TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include -I$(TOOLCHAIN_DIR)/include TARGET_LDFLAGS+= -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Define recent gcc for x86 target
Current Config.version does not define a gcc version for the x86 target. As a result version 4.1.2 is used. Signed-off-by: Roberto Riggioroberto.rig...@create-net.org -- Index: toolchain/gcc/Config.version === --- toolchain/gcc/Config.version(revision 23220) +++ toolchain/gcc/Config.version(working copy) @@ -80,6 +80,6 @@ default y if powerpc config GCC_VERSION_4_4_4 -default y if (TARGET_octeon || TARGET_sibyte || TARGET_omap35xx) +default y if (TARGET_octeon || TARGET_sibyte || TARGET_omap35xx || TARGET_x86) endif ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [OT] Question about madwifi
Hi, this question is partially OT. However I'm asking also here since some openwrt devs are supporting the madwifi driver. I'm looking for an example on how to use transmission feedback on a device operating in monitor mode with madwifi. I've already managed to write an userlevel software that inject packets over a monitor interface (using the click modular router). However no tx feedback frames are sent back by the driver. To be precise I get some frame back that are marked as TX feedback but the content of their radiotap header is clearly wrong (wrong data rate, wrote tx attempts). I say that their are wrong because they do not agree with the logs that i get using wireshark on a third pc. Thanks R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] clock_gettime not found when compiling a package
On 09/28/2010 10:57 PM, Michael Büsch wrote: I think you should use the default configure and build rules and just modify the buildflags CONFIGURE_VARS, CONFIGURE_ARGS, MAKE_... BTW openwrt by default call the build/compile procedure. How can I make openwrt call the build/install procedure? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Disable honour-copts flag
A package that I'm trying to compile produces the following error: cc1plus: error: unrecognized command line option -fhonour-copts I've removed the option from rules.mk and everything seems to work fine is there a way to disable the flag from the makefile and still keep using most of the default value. At the moment my makefile is very lightweight: EXTRA_CFLAGS=-MD -fno-stack-protector CONFIGURE_ARGS += \ --enable-userlevel \ --disable-linuxmodule \ --disable-dynamic-linking \ Thanks R ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] clock_gettime not found when compiling a package
On 09/28/2010 10:57 PM, Michael Büsch wrote: You can add a patch. Yes, I know, but I would like to understand if I can use a cleaner way. I think you should use the default configure and build rules and just modify the buildflags CONFIGURE_VARS, CONFIGURE_ARGS, MAKE_... Ok I've reduce the configure block to: CONFIGURE_ARGS+= \ --prefix=/usr \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --enable-tools=mixed \ --enable-userlevel \ --enable-wifi \ --enable-wing \ --disable-linuxmodule \ --disable-dynamic-linking \ However in the build part I need to run make to build some utils the use one of these utils and then run make again, this is how the build block looks like: define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) tools elementmap.xml (cd $(PKG_BUILD_DIR)/userlevel; \ ../tools/click-mkmindriver/click-mkmindriver -p $(PKG_NAME) -C .. \ -f $(PKG_BUILD_DIR)/conf/wing/sample.click \ -A --all -E Discard -E Print -E Null \ -E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \ -E RadiotapDecap -E RadiotapEncap \ -E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \ -E RoundRobinSched -E DRRSched; \ ); $(MAKE) -C $(PKG_BUILD_DIR) \ MINDRIVER=$(PKG_NAME) \ DESTDIR=$(PKG_INSTALL_DIR) \ all install endef However when running the first make i get the following errors: make -C /home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927 tools elementmap.xml make[3]: Entering directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927' make[4]: Entering directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927/tools' make[5]: Entering directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927/tools/lib' CXX ../../lib/string.cc make[5]: [string.o] Error 1 (ignored) CXX ../../lib/straccum.cc make[5]: [straccum.o] Error 1 (ignored) CXX ../../lib/glue.cc make[5]: [glue.o] Error 1 (ignored) CXX ../../lib/bitvector.cc make[5]: [bitvector.o] Error 1 (ignored) CXX ../../lib/vectorv.cc make[5]: [vectorv.o] Error 1 (ignored) CXX ../../lib/hashallocator.cc make[5]: [hashallocator.o] Error 1 (ignored) CXX ../../lib/ipaddress.cc make[5]: [ipaddress.o] Error 1 (ignored) CXX ../../lib/etheraddress.cc make[5]: [etheraddress.o] Error 1 (ignored) CXX ../../lib/timestamp.cc make[5]: [timestamp.o] Error 1 (ignored) CXX ../../lib/error.cc make[5]: [error.o] Error 1 (ignored) CXX elementt.cc make[5]: [elementt.o] Error 1 (ignored) CXX eclasst.cc make[5]: [eclasst.o] Error 1 (ignored) CXX routert.cc make[5]: [routert.o] Error 1 (ignored) CXX runparse.cc make[5]: [runparse.o] Error 1 (ignored) CXX ../../lib/variableenv.cc make[5]: [variableenv.o] Error 1 (ignored) CXX landmarkt.cc make[5]: [landmarkt.o] Error 1 (ignored) CXX lexert.cc make[5]: [lexert.o] Error 1 (ignored) CXX lexertinfo.cc make[5]: [lexertinfo.o] Error 1 (ignored) CXX ../../lib/driver.cc make[5]: [driver.o] Error 1 (ignored) CXX ../../lib/confparse.cc make[5]: [confparse.o] Error 1 (ignored) CXX ../../lib/archive.cc make[5]: [archive.o] Error 1 (ignored) CXX processingt.cc make[5]: [processingt.o] Error 1 (ignored) CXX etraits.cc make[5]: [etraits.o] Error 1 (ignored) CXX elementmap.cc make[5]: [elementmap.o] Error 1 (ignored) CXX ../../lib/userutils.cc make[5]: [userutils.o] Error 1 (ignored) CXX ../../lib/md5.cc make[5]: [md5.o] Error 1 (ignored) CXX toolutils.cc make[5]: [toolutils.o] Error 1 (ignored) CC ../../lib/clp.c make[5]: [clp.o] Error 1 (ignored) AR libclicktool.a RANLIB libclicktool.a BUILDCXX ../../lib/string.cc cc1plus: error: unrecognized command line option -fhonour-copts make[5]: *** [string.bo] Error 1 make[5]: Leaving directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927/tools/lib' make[4]: *** [lib] Error 2 make[4]: Leaving directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927/tools' make[3]: *** [tools] Error 2 make[3]: Leaving directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927' make[2]: *** [/home/rriggio/src/wing/staging/kamikaze-trunk-22834/build_dir/target-i386_uClibc-0.9.30.1/wing-20100927/.built] Error 2 make[2]: Leaving directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834/feeds/wing/wing' make[1]: *** [package/feeds/wing/wing/install] Error 2 make[1]: Leaving directory `/home/rriggio/src/wing/staging/kamikaze-trunk-22834' make: *** [package/wing/install] Error 2 ___ openwrt-devel
[OpenWrt-Devel] clock_gettime not found when compiling a package
Hi, when compiling a package for openwrt i get the following error: ../lib/libclicktool_build.a(glue.bo): In function `click_random_srandom()': glue.cc:(.text+0xa40): undefined reference to `clock_gettime' Any idea about where the problem could be? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] How do I configure mesh networking (802.11s) in LUCI?
I think that there is a plugin for luci for managing olsr-based wireless mesh networks. On 09/17/2010 06:06 AM, Robert Chan wrote: Hi all, Based on the great help from this group, I have finally managed to install OpenWRT on my router with mesh support (selected in kernel_menuconfig). However, I cannot find any mesh (or 802.11s) related menu in Luci. So do I need to configure mesh in Luci at all? If so, where in Luci can I find the 802.11s configuration menu? Thanks very much in advance. Regards, Robert ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New wireless mesh network routing protocol
On 08/12/2010 01:54 PM, Xianghua Xiao wrote: which mode will this routing protocol running on top of, is it mesh mode, adhoc/ibss, or monitoring mode? does it work with 11n/HT(as the website mentions MIMO)? The routing protocols runs on top of interface operating in monitor mode and supporting frame injection. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New wireless mesh network routing protocol
On 08/12/2010 02:19 PM, Benjamin Henrion wrote: Does it uses adhoc on top of monitor? Or it uses a custom mode? It is a custom mode built on top of the monitor mode. Basically the router creates raw ieee80211 frames and inject them using radiotap headers. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] New wireless mesh network routing protocol
On 08/12/2010 02:15 PM, Roberto Riggio wrote: On 08/12/2010 01:54 PM, Xianghua Xiao wrote: which mode will this routing protocol running on top of, is it mesh mode, adhoc/ibss, or monitoring mode? does it work with 11n/HT(as the website mentions MIMO)? I'm currently trying to integrate some patches posted on linux wireless to add support for MCS selection R. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New wireless mesh network routing protocol
Hi,
this patch adds support for WING a new routing protocol for wireless
mesh networks. WING is an extension of the Roofnet routing protocol
developed by MIT. The new features are: support for multiple radio
interfaces, and link quality based routing using the WCETT metric.
The source code is hosted at github.
Upon install, this package will create a new entry in the network section:
config 'interface' 'mesh'
option 'proto' 'wing'
option 'profile' 'bulk'
option 'rc' 'static'
option 'ls' 'fcfs'
option 'metric' 'wcett'
option 'prefix' '6'
option 'period' '36000'
option 'tau' '36'
option 'debug' 'true'
The only mandatory field is proto. After running ifup mesh a new interface
will be created. This interface is called wing-$(ifname) and uses
multi-hopping.
Here follows a short description for the other parameters:
profile, profile to be used for building the configuration for the click
router (at the moment only one profile is defined)
rc, rate control algorithm (static, madwifi, autoratefallback)
ls, outgoing link scheduling policy (fcfs, drr)
metric, routing metric (etx, ett, wcett)
period, tau, averaging period for network probes, smoothing window
Signed-off-by: Roberto Riggio roberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 0)
+++ net/wing/files/lib/network/wing.sh (revision 0)
@@ -0,0 +1,145 @@
+
+scan_wing() {
+ config_set $1 device wing-$1
+}
+
+coldplug_interface_wing() {
+setup_interface_wing wing-$1 $1
+}
+
+stop_interface_wing() {
+ local config=$1
+ local iface=wing-$config
+ env -i ACTION=ifdown INTERFACE=$config DEVICE=$iface PROTO=wing
/sbin/hotplug-call iface
+ [ -f /var/run/$iface.pid ] {
+ kill -9 $(cat /var/run/$iface.pid)
+ rm /var/run/$iface.pid
+ }
+}
+
+setup_interface_wing() {
+
+local iface=$1
+local config=$2
+
+ local hwmodes=
+ local freqs=
+ local ifnames=
+ local hwaddrs=
+
+ config_load wireless
+ config_foreach wing_list_interfaces wifi-iface
+
+ # start click router
+ if [ $hwmodes = -o $freqs = -o $ifnames = -o $hwaddrs =
]; then
+ logger -t $config No raw interfaces available. Exiting.
+ exit 1
+ fi
+
+ local profile rc ls prefix debug
+
+ config_get profile $config profile bulk
+ config_get rc $config rc static
+ config_get ls $config ls fcfs
+ config_get metric $config metric wcett
+ config_get prefix $config prefix 6
+ config_get period $config period 1
+ config_get tau $config tau 10
+ config_get_bool debug $config debug False
+
+ local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
+ local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F: '{printf
0x%s 0x%s 0x%s,$4,$5,$6}'))
+ local netmask=255.0.0.0
+
+ if ! wing_template_available profile $profile bulk; then
+ logger -t $config Unable to configure router. Exiting.
+ exit 1
+ fi
+
+ if ! wing_template_available rc $rc static; then
+ logger -t $config Unable to configure rate control. Exiting.
+ exit 1
+ fi
+
+ if ! wing_template_available ls $ls radiotap; then
+ logger -t $config Unable to configure link scheduler.
Exiting.
+ exit 1
+ fi
+
+ if [ $profile = -o $rc = ]; then
+ logger -t $config Unable to generate template. Exiting.
+ exit 1
+ fi
+
+ [ $debug == 0 ] dbg= || dbg=-d
+
+ /usr/bin/click_config -p $profile -r $rc -s $ls -l $metric \
+ -m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
+ | sed -e s/__XR_IFNAME__/$iface/g \
+ | sed -e s/__XR_IP__/$ipaddr/g \
+ | sed -e s/__XR_NM__/$netmask/g \
+ | sed -e s/__XR_PERIOD__/$period/g \
+ | sed -e s/__XR_TAU__/$tau/g /tmp/$iface.click
+
+ /usr/bin/click-align /tmp/$iface.click /tmp/$iface-aligned.click
2/var/log/$iface.log
+ [ ! -c /dev/net/tun ] {
+ mkdir -p /dev/net/
+ mknod /dev/net/tun c 10 200
+ if [ ! -c /dev/net/tun ]; then
+ logger -t $config Device not available (/dev/net/tun).
Exiting.
+ exit 1
+ fi
+ }
+
+ # creating the tun interface below will trigger a net subsystem event
+ # prevent it from touching iface by disabling .auto here
+ uci_set_state network $config auto 0
+
+ (/usr/bin/click /tmp/$iface-aligned.click /var/log/$iface.log 21)
+ sleep 2
+ ps | grep /usr/bin/click | grep -q -v grep || {
+ logger -t $config Unable to start click. Exiting
Re: [OpenWrt-Devel] [PATCH] New wireless mesh network routing protocol
The official website is
http://www.wing-project.org
The website contains several info about the routing protocol. An extended
description of the wing package for openwrt can be found here:
http://wing-project.org/openwrt:wing
I've developed most of the code for the routing protocol and for
the integration with openwrt, so i can probably answer to your
questions.
R.
On 08/11/2010 01:37 PM, L. Aaron Kaplan wrote:
is there any docu on WING?
On Aug 11, 2010, at 11:55 AM, Roberto Riggio wrote:
Hi,
this patch adds support for WING a new routing protocol for wireless
mesh networks. WING is an extension of the Roofnet routing protocol
developed by MIT. The new features are: support for multiple radio
interfaces, and link quality based routing using the WCETT metric.
The source code is hosted at github.
Upon install, this package will create a new entry in the network section:
config 'interface' 'mesh'
option 'proto' 'wing'
option 'profile' 'bulk'
option 'rc' 'static'
option 'ls' 'fcfs'
option 'metric' 'wcett'
option 'prefix' '6'
option 'period' '36000'
option 'tau' '36'
option 'debug' 'true'
The only mandatory field is proto. After running ifup mesh a new interface
will be created. This interface is called wing-$(ifname) and uses multi-hopping.
Here follows a short description for the other parameters:
profile, profile to be used for building the configuration for the click
router (at the moment only one profile is defined)
rc, rate control algorithm (static, madwifi, autoratefallback)
ls, outgoing link scheduling policy (fcfs, drr)
metric, routing metric (etx, ett, wcett)
period, tau, averaging period for network probes, smoothing window
Signed-off-by: Roberto Riggioroberto.rig...@create-net.org
--
Index: net/wing/files/lib/network/wing.sh
===
--- net/wing/files/lib/network/wing.sh (revision 0)
+++ net/wing/files/lib/network/wing.sh (revision 0)
@@ -0,0 +1,145 @@
+
+scan_wing() {
+ config_set $1 device wing-$1
+}
+
+coldplug_interface_wing() {
+setup_interface_wing wing-$1 $1
+}
+
+stop_interface_wing() {
+ local config=$1
+ local iface=wing-$config
+ env -i ACTION=ifdown INTERFACE=$config DEVICE=$iface PROTO=wing
/sbin/hotplug-call iface
+ [ -f /var/run/$iface.pid ] {
+ kill -9 $(cat /var/run/$iface.pid)
+ rm /var/run/$iface.pid
+ }
+}
+
+setup_interface_wing() {
+
+local iface=$1
+local config=$2
+
+ local hwmodes=
+ local freqs=
+ local ifnames=
+ local hwaddrs=
+
+ config_load wireless
+ config_foreach wing_list_interfaces wifi-iface
+
+ # start click router
+ if [ $hwmodes = -o $freqs = -o $ifnames = -o $hwaddrs =
]; then
+ logger -t $config No raw interfaces available. Exiting.
+ exit 1
+ fi
+
+ local profile rc ls prefix debug
+
+ config_get profile $config profile bulk
+ config_get rc $config rc static
+ config_get ls $config ls fcfs
+ config_get metric $config metric wcett
+ config_get prefix $config prefix 6
+ config_get period $config period 1
+ config_get tau $config tau 10
+ config_get_bool debug $config debug False
+
+ local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
+ local ipaddr=$(printf $prefix.%d.%d.%d $(echo $hwaddr | awk -F: '{printf
0x%s 0x%s 0x%s,$4,$5,$6}'))
+ local netmask=255.0.0.0
+
+ if ! wing_template_available profile $profile bulk; then
+ logger -t $config Unable to configure router. Exiting.
+ exit 1
+ fi
+
+ if ! wing_template_available rc $rc static; then
+ logger -t $config Unable to configure rate control. Exiting.
+ exit 1
+ fi
+
+ if ! wing_template_available ls $ls radiotap; then
+ logger -t $config Unable to configure link scheduler.
Exiting.
+ exit 1
+ fi
+
+ if [ $profile = -o $rc = ]; then
+ logger -t $config Unable to generate template. Exiting.
+ exit 1
+ fi
+
+ [ $debug == 0 ] dbg= || dbg=-d
+
+ /usr/bin/click_config -p $profile -r $rc -s $ls -l $metric \
+ -m $hwmodes -c $freqs -n $ifnames -a $hwaddrs $dbg \
+ | sed -e s/__XR_IFNAME__/$iface/g \
+ | sed -e s/__XR_IP__/$ipaddr/g \
+ | sed -e s/__XR_NM__/$netmask/g \
+ | sed -e s/__XR_PERIOD__/$period/g \
+ | sed -e s/__XR_TAU__/$tau/g /tmp/$iface.click
+
+ /usr/bin/click-align /tmp/$iface.click /tmp/$iface-aligned.click
2/var/log/$iface.log
+ [ ! -c /dev/net/tun ] {
+ mkdir -p /dev/net/
+ mknod /dev/net/tun c 10 200
+ if [ ! -c /dev/net/tun ]; then
+ logger -t $config Device
