From c1ecfca5d423dadfdb5686a7e2b0e6736fb34582 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 13 Apr 2020 00:23:10 +0800 Subject: [PATCH] luci-app-udp2raw: sort out files --- package/ntlf9t/luci-app-udp2raw/Makefile | 64 +--- .../files/luci/i18n/udp2raw.zh-cn.lmo | Bin 1372 -> 0 bytes .../files/root/etc/init.d/udp2raw.init | 167 --------- .../luci => luasrc}/controller/udp2raw.lua | 0 .../model/cbi/udp2raw/general.lua | 0 .../model/cbi/udp2raw/servers-details.lua | 0 .../model/cbi/udp2raw/servers.lua | 0 .../view/udp2raw/dynamiclist.htm | 0 .../luci => luasrc}/view/udp2raw/status.htm | 0 .../zh_Hans/udp2raw.po} | 0 .../{files => }/root/etc/config/udp2raw | 0 .../{files => }/root/etc/init.d/udp2raw | 0 .../root/etc/uci-defaults/luci-udp2raw | 0 .../luci-app-udp2raw/tools/po2lmo/Makefile | 12 - .../tools/po2lmo/src/po2lmo.c | 247 ------------- .../tools/po2lmo/src/template_lmo.c | 328 ------------------ .../tools/po2lmo/src/template_lmo.h | 92 ----- 17 files changed, 8 insertions(+), 902 deletions(-) delete mode 100644 package/ntlf9t/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.lmo delete mode 100755 package/ntlf9t/luci-app-udp2raw/files/root/etc/init.d/udp2raw.init rename package/ntlf9t/luci-app-udp2raw/{files/luci => luasrc}/controller/udp2raw.lua (100%) rename package/ntlf9t/luci-app-udp2raw/{files/luci => luasrc}/model/cbi/udp2raw/general.lua (100%) rename package/ntlf9t/luci-app-udp2raw/{files/luci => luasrc}/model/cbi/udp2raw/servers-details.lua (100%) rename package/ntlf9t/luci-app-udp2raw/{files/luci => luasrc}/model/cbi/udp2raw/servers.lua (100%) rename package/ntlf9t/luci-app-udp2raw/{files/luci => luasrc}/view/udp2raw/dynamiclist.htm (100%) rename package/ntlf9t/luci-app-udp2raw/{files/luci => luasrc}/view/udp2raw/status.htm (100%) rename package/ntlf9t/luci-app-udp2raw/{files/luci/i18n/udp2raw.zh-cn.po => po/zh_Hans/udp2raw.po} (100%) rename package/ntlf9t/luci-app-udp2raw/{files => }/root/etc/config/udp2raw (100%) rename package/ntlf9t/luci-app-udp2raw/{files => }/root/etc/init.d/udp2raw (100%) rename package/ntlf9t/luci-app-udp2raw/{files => }/root/etc/uci-defaults/luci-udp2raw (100%) delete mode 100644 package/ntlf9t/luci-app-udp2raw/tools/po2lmo/Makefile delete mode 100644 package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/po2lmo.c delete mode 100644 package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.c delete mode 100644 package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.h diff --git a/package/ntlf9t/luci-app-udp2raw/Makefile b/package/ntlf9t/luci-app-udp2raw/Makefile index e77eb541e7..9347c610ea 100644 --- a/package/ntlf9t/luci-app-udp2raw/Makefile +++ b/package/ntlf9t/luci-app-udp2raw/Makefile @@ -7,67 +7,19 @@ include $(TOPDIR)/rules.mk +LUCI_TITLE:=LuCI Support for udp2raw-tunnel +LUCI_DESCRIPTION:=LuCI Support for udp2raw-tunnel. +LUCI_DEPENDS:=+udp2raw-tunnel +LUCI_PKGARCH:=all + PKG_NAME:=luci-app-udp2raw PKG_VERSION:=1.0.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jian Chang -include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/luci/luci.mk -define Package/$(PKG_NAME) - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI Support for udp2raw-tunnel - PKGARCH:=all - DEPENDS:=+udp2raw-tunnel -endef - -define Package/$(PKG_NAME)/description - LuCI Support for udp2raw-tunnel. -endef - -define Build/Prepare - $(foreach po,$(wildcard ${CURDIR}/files/luci/i18n/*.po), \ - po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/$(PKG_NAME)/postinst -#!/bin/sh -if [ -z "$${IPKG_INSTROOT}" ]; then - ( . /etc/uci-defaults/luci-udp2raw ) && rm -f /etc/uci-defaults/luci-udp2raw -fi -exit 0 -endef - -define Package/$(PKG_NAME)/conffiles - /etc/config/udp2raw -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - $(INSTALL_DATA) $(PKG_BUILD_DIR)/udp2raw.*.lmo $(1)/usr/lib/lua/luci/i18n/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller - $(INSTALL_DATA) ./files/luci/controller/*.lua $(1)/usr/lib/lua/luci/controller/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/udp2raw - $(INSTALL_DATA) ./files/luci/model/cbi/udp2raw/*.lua $(1)/usr/lib/lua/luci/model/cbi/udp2raw/ - $(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/udp2raw - $(INSTALL_DATA) ./files/luci/view/udp2raw/*.htm $(1)/usr/lib/lua/luci/view/udp2raw/ - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/root/etc/config/udp2raw $(1)/etc/config/udp2raw - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/root/etc/init.d/udp2raw $(1)/etc/init.d/udp2raw - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/root/etc/uci-defaults/luci-udp2raw $(1)/etc/uci-defaults/luci-udp2raw -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.lmo b/package/ntlf9t/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.lmo deleted file mode 100644 index a73a6cf62b3f7afc647f65cdb53850730f7ea31e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1372 zcma)5e{54#7=7JvVWe(4)C@79>4a<%_M1g3>cnZ7ETe#6G&mVub;}kvV7Nqvwz#o& z>u3wK-O3wl$419i+fGQw+PZ2K6X&A;kch(#CcXE)iV-m}K-9%^_k`_Fo1FBVd(U_7 zcfa@EfvSf5eU(j$xYHBYALlsHH!ghU<2cH9l6E)g9u$0T!E%HXqZZL^654}Qr>FL| zSU4yc4V3o^5xeNOQb#cEI8V%eYV^P+8K}cWZHDW*!%}VR!Y3Td9g-wC=?x)4I`RH_ zY+cU_Ck8n#79J4&1EAC}N-TcTjx}N!CYDa*I9v-o5xST1R^a z7R+QUNcce#Z57Yx+1%SYsXZVCFUr}k-K(I3?)g43!C2_1;+@J`ZKI|^AvjwUY@76* zLNijU^JgPgv1NPdeBG%I!Rw8MOl0IRFhvs9L{X$vg(TLRopBv0gc!O+%JaHG8&b{b(=obllIwdqE;0VhB=G z8@n+x&X;hY_s0Ie>LfGHj)hzQyYp)=sdILe+{<$ekf=ildGInUdC!*qFgKEcmePS# z`JC+gC#i2cxB*B``K7onsrJ=Y@CK$+hk4CL|MfnOlP!f#dz4H%H&o1?0WSm6SF4uj zgWtTo0lXQIXPFJMfbyvX_;aC`tzETZVypAga&Y!bDa!t*m{#0=7W^`hTEq`N)7-Za z^$9$5a_J*i)$f0|BMLqV$hS04^-gGN&Vd&*UGeR6U#zaroJBtKtKNRTDnoYm4}8J0 z81$OmlZVn@-}yoj_(MR_?kip8yRx%P-~pyJb~0w=*UiCS0xhp=`YR>8_h$j;|H||} zRpMsl(_J`URt>$zSoZsa=a&0eFA*Tse9YK?@axBH*hkM?QnxMNIrBrw$Ee3w%Dw2M zRYQqOhsv?9hL)f2xsmt5#Yh|W< zv2{)C{_K8f7vFv5EAJ-tIO-dqv#u1a?603$(F}e9NSeO(salgW^$~a`Ais8ZZd2%| zJ-3i&VVeFOND#~TZQvJxMDc2Eb=GVIS+ZShKfZZq;PQtji=m%@PK!H?k89m`XTU`u u<+mH7?QcxfOoLYe$+!O0b-h*Hw-x=c`8;sD^I&mBOIkMg9Uv9!cm4&ZY/dev/null 2>&1 || return 1 - ipt_cmd='iptables' - [ -n "$(iptables -h 2> /dev/null | grep -e '--wait')" ] && ipt_cmd="$ipt_cmd --wait" - echo "# firewall include file" > "/var/etc/$NAME.include" - else - echo "$ipt_cmd" | grep -q -e '--wait' - [ $? -ne 0 ] && sleep 2 - fi - - $ipt_cmd -I INPUT -s "$server_addr"/32 -p tcp -m tcp --sport "$server_port" -m comment --comment "${NAME}DwrW" -j DROP -} - -flush_ipt_rules() { - iptables-save -c | grep -v "${NAME}DwrW" | iptables-restore -c - [ -f "/var/etc/$NAME.include" ] && rm -f "/var/etc/$NAME.include" -} - -export_ipt_rules() { - [ -f "/var/etc/$NAME.include" ] || return - cat <<-CAT >> "/var/etc/$NAME.include" - iptables-save -c | grep -v "${NAME}DwrW" | iptables-restore -c - iptables-restore -n <<-EOF - $(iptables-save -t filter | grep -E "${NAME}DwrW|^\*|^COMMIT" | sed 's/^-A /-I /') - EOF -CAT -} - -create_config() { - local config_file="$1" - echo "# auto-generated config file from /etc/config/udp2raw" > $config_file - - echo "-c" >> $config_file - echo "-l ${listen_addr}:${listen_port}" >> $config_file - echo "-r ${server_addr}:${server_port}" >> $config_file - - [ -n "$raw_mode" ] && echo "--raw-mode ${raw_mode}" >> $config_file - [ -n "$key" ] && echo "--key ${key}" >> $config_file - [ -n "$cipher_mode" ] && echo "--cipher-mode ${cipher_mode}" >> $config_file - [ -n "$auth_mode" ] && echo "--auth-mode ${auth_mode}" >> $config_file - - [ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--auto-rule" >> $config_file - [ $auto_rule -eq 1 -a $keep_rule -eq 1 ] && echo "--keep-rule" >> $config_file - - [ -n "$seq_mode" ] && echo "--seq-mode ${seq_mode}" >> $config_file - [ -n "$lower_level" ] && echo "--lower-level ${lower_level}" >> $config_file - [ -n "$source_ip" ] && echo "--source-ip ${source_ip}" >> $config_file - [ -n "$source_port" ] && echo "--source-port ${source_port}" >> $config_file - echo "--retry-on-error" >> $config_file - - [ -n "$log_level" ] && echo "--log-level ${log_level}" >> $config_file - echo "--disable-color" >> $config_file -} - -validate_config_section() { - local ret=$(/sbin/validate_data "$NAME" general "$1" \ - 'server:uciname' \ - 'daemon_user:string:root' \ - 2> /dev/null) - [ $? -ne 0 ] && return 1 - eval "$ret" -} - -validate_server_section() { - local ret=$(/sbin/validate_data "$NAME" servers "$1" \ - 'server_addr:host' \ - 'server_port:port:8080' \ - 'listen_addr:ipaddr:127.0.0.1' \ - 'listen_port:port:2080' \ - 'raw_mode:or("faketcp", "udp", "icmp"):faketcp' \ - 'key:string' \ - 'cipher_mode:or("aes128cbc", "xor", "none"):aes128cbc' \ - 'auth_mode:or("md5", "crc32", "simple", "none"):md5' \ - 'auto_rule:bool:1' \ - 'keep_rule:bool:0' \ - 'seq_mode:range(0,4)' \ - 'lower_level:string' \ - 'source_ip:ipaddr' \ - 'source_port:port' \ - 'log_level:range(0,6)' \ - 2> /dev/null) - [ $? -ne 0 ] && return 1 - eval "$ret" -} - -start_instance() { - local server="$1" - - if [ -z "$server" -o "$server" == "nil" ]; then - return 0 - elif ! validate_server_section "$server"; then - _log "err" "Server config validation failed." - return 1 - fi - - /sbin/validate_data "ipaddr" "$server_addr" >/dev/null 2>&1 - [ $? -ne 0 ] && server_addr=$(nslookup "$server_addr" | \ - sed -n 's/^Address[[:space:]]*[0-9]*:[[:space:]]*\(\([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\)$/\1/p') - if [ -z "$server_addr" ]; then - _log "err" "Server address validation failed." - return 1 - fi - - [ -d /var/etc ] || mkdir -p /var/etc - local config_file="/var/etc/${NAME}.${server}.conf" - create_config "$config_file" || return 1 - [ -d "/var/log/${NAME}" ] || mkdir -p "/var/log/${NAME}" - - if [ $auto_rule -eq 1 -a $keep_rule -ne 1 ]; then - add_ipt_rule || { _log "err" "added iptables rule failed."; return 1; } - fi - - /usr/bin/udp2raw --conf-file "$config_file" >> "/var/log/${NAME}/${NAME}.${server}.log" & - echo $! > "/var/run/${NAME}.${server}.pid" - return 0 -} - -start() { - pgrep "/usr/bin/${NAME}" >/dev/null 2>&1 && return - - if ! validate_config_section "general" ; then - _log "err" "Config validate failed." - return 1 - fi - has_valid_server $server || return 1 - flush_ipt_rules - for srv in $server; do - start_instance $srv - done - export_ipt_rules -} - -stop() { - local pids=$(pgrep "/usr/bin/${NAME}" 2> /dev/null) - [ $? -ne 0 ] && return - for pid in $pids; do - kill $pid >/dev/null 2>&1 - done - flush_ipt_rules - return 0 -} - -restart() { - stop - sleep 1 - start -} diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/controller/udp2raw.lua b/package/ntlf9t/luci-app-udp2raw/luasrc/controller/udp2raw.lua similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/luci/controller/udp2raw.lua rename to package/ntlf9t/luci-app-udp2raw/luasrc/controller/udp2raw.lua diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua b/package/ntlf9t/luci-app-udp2raw/luasrc/model/cbi/udp2raw/general.lua similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/luci/model/cbi/udp2raw/general.lua rename to package/ntlf9t/luci-app-udp2raw/luasrc/model/cbi/udp2raw/general.lua diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers-details.lua b/package/ntlf9t/luci-app-udp2raw/luasrc/model/cbi/udp2raw/servers-details.lua similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers-details.lua rename to package/ntlf9t/luci-app-udp2raw/luasrc/model/cbi/udp2raw/servers-details.lua diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers.lua b/package/ntlf9t/luci-app-udp2raw/luasrc/model/cbi/udp2raw/servers.lua similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/luci/model/cbi/udp2raw/servers.lua rename to package/ntlf9t/luci-app-udp2raw/luasrc/model/cbi/udp2raw/servers.lua diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm b/package/ntlf9t/luci-app-udp2raw/luasrc/view/udp2raw/dynamiclist.htm similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/luci/view/udp2raw/dynamiclist.htm rename to package/ntlf9t/luci-app-udp2raw/luasrc/view/udp2raw/dynamiclist.htm diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/view/udp2raw/status.htm b/package/ntlf9t/luci-app-udp2raw/luasrc/view/udp2raw/status.htm similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/luci/view/udp2raw/status.htm rename to package/ntlf9t/luci-app-udp2raw/luasrc/view/udp2raw/status.htm diff --git a/package/ntlf9t/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po b/package/ntlf9t/luci-app-udp2raw/po/zh_Hans/udp2raw.po similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/luci/i18n/udp2raw.zh-cn.po rename to package/ntlf9t/luci-app-udp2raw/po/zh_Hans/udp2raw.po diff --git a/package/ntlf9t/luci-app-udp2raw/files/root/etc/config/udp2raw b/package/ntlf9t/luci-app-udp2raw/root/etc/config/udp2raw similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/root/etc/config/udp2raw rename to package/ntlf9t/luci-app-udp2raw/root/etc/config/udp2raw diff --git a/package/ntlf9t/luci-app-udp2raw/files/root/etc/init.d/udp2raw b/package/ntlf9t/luci-app-udp2raw/root/etc/init.d/udp2raw similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/root/etc/init.d/udp2raw rename to package/ntlf9t/luci-app-udp2raw/root/etc/init.d/udp2raw diff --git a/package/ntlf9t/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw b/package/ntlf9t/luci-app-udp2raw/root/etc/uci-defaults/luci-udp2raw similarity index 100% rename from package/ntlf9t/luci-app-udp2raw/files/root/etc/uci-defaults/luci-udp2raw rename to package/ntlf9t/luci-app-udp2raw/root/etc/uci-defaults/luci-udp2raw diff --git a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/Makefile b/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/Makefile deleted file mode 100644 index ad2c133207..0000000000 --- a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -INSTALL = install -PREFIX = /usr/bin - -po2lmo: src/po2lmo.o src/template_lmo.o - $(CC) $(LDFLAGS) -o src/po2lmo src/po2lmo.o src/template_lmo.o - -install: - $(INSTALL) -m 755 src/po2lmo $(PREFIX) - -clean: - $(RM) src/po2lmo src/*.o diff --git a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/po2lmo.c b/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/po2lmo.c deleted file mode 100644 index 0da792b680..0000000000 --- a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/po2lmo.c +++ /dev/null @@ -1,247 +0,0 @@ -/* - * lmo - Lua Machine Objects - PO to LMO conversion tool - * - * Copyright (C) 2009-2012 Jo-Philipp Wich - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "template_lmo.h" - -static void die(const char *msg) -{ - fprintf(stderr, "Error: %s\n", msg); - exit(1); -} - -static void usage(const char *name) -{ - fprintf(stderr, "Usage: %s input.po output.lmo\n", name); - exit(1); -} - -static void print(const void *ptr, size_t size, size_t nmemb, FILE *stream) -{ - if( fwrite(ptr, size, nmemb, stream) == 0 ) - die("Failed to write stdout"); -} - -static int extract_string(const char *src, char *dest, int len) -{ - int pos = 0; - int esc = 0; - int off = -1; - - for( pos = 0; (pos < strlen(src)) && (pos < len); pos++ ) - { - if( (off == -1) && (src[pos] == '"') ) - { - off = pos + 1; - } - else if( off >= 0 ) - { - if( esc == 1 ) - { - switch (src[pos]) - { - case '"': - case '\\': - off++; - break; - } - dest[pos-off] = src[pos]; - esc = 0; - } - else if( src[pos] == '\\' ) - { - dest[pos-off] = src[pos]; - esc = 1; - } - else if( src[pos] != '"' ) - { - dest[pos-off] = src[pos]; - } - else - { - dest[pos-off] = '\0'; - break; - } - } - } - - return (off > -1) ? strlen(dest) : -1; -} - -static int cmp_index(const void *a, const void *b) -{ - uint32_t x = ((const lmo_entry_t *)a)->key_id; - uint32_t y = ((const lmo_entry_t *)b)->key_id; - - if (x < y) - return -1; - else if (x > y) - return 1; - - return 0; -} - -static void print_uint32(uint32_t x, FILE *out) -{ - uint32_t y = htonl(x); - print(&y, sizeof(uint32_t), 1, out); -} - -static void print_index(void *array, int n, FILE *out) -{ - lmo_entry_t *e; - - qsort(array, n, sizeof(*e), cmp_index); - - for (e = array; n > 0; n--, e++) - { - print_uint32(e->key_id, out); - print_uint32(e->val_id, out); - print_uint32(e->offset, out); - print_uint32(e->length, out); - } -} - -int main(int argc, char *argv[]) -{ - char line[4096]; - char key[4096]; - char val[4096]; - char tmp[4096]; - int state = 0; - int offset = 0; - int length = 0; - int n_entries = 0; - void *array = NULL; - lmo_entry_t *entry = NULL; - uint32_t key_id, val_id; - - FILE *in; - FILE *out; - - if( (argc != 3) || ((in = fopen(argv[1], "r")) == NULL) || ((out = fopen(argv[2], "w")) == NULL) ) - usage(argv[0]); - - memset(line, 0, sizeof(key)); - memset(key, 0, sizeof(val)); - memset(val, 0, sizeof(val)); - - while( (NULL != fgets(line, sizeof(line), in)) || (state >= 2 && feof(in)) ) - { - if( state == 0 && strstr(line, "msgid \"") == line ) - { - switch(extract_string(line, key, sizeof(key))) - { - case -1: - die("Syntax error in msgid"); - case 0: - state = 1; - break; - default: - state = 2; - } - } - else if( state == 1 || state == 2 ) - { - if( strstr(line, "msgstr \"") == line || state == 2 ) - { - switch(extract_string(line, val, sizeof(val))) - { - case -1: - state = 4; - break; - default: - state = 3; - } - } - else - { - switch(extract_string(line, tmp, sizeof(tmp))) - { - case -1: - state = 2; - break; - default: - strcat(key, tmp); - } - } - } - else if( state == 3 ) - { - switch(extract_string(line, tmp, sizeof(tmp))) - { - case -1: - state = 4; - break; - default: - strcat(val, tmp); - } - } - - if( state == 4 ) - { - if( strlen(key) > 0 && strlen(val) > 0 ) - { - key_id = sfh_hash(key, strlen(key)); - val_id = sfh_hash(val, strlen(val)); - - if( key_id != val_id ) - { - n_entries++; - array = realloc(array, n_entries * sizeof(lmo_entry_t)); - entry = (lmo_entry_t *)array + n_entries - 1; - - if (!array) - die("Out of memory"); - - entry->key_id = key_id; - entry->val_id = val_id; - entry->offset = offset; - entry->length = strlen(val); - - length = strlen(val) + ((4 - (strlen(val) % 4)) % 4); - - print(val, length, 1, out); - offset += length; - } - } - - state = 0; - memset(key, 0, sizeof(key)); - memset(val, 0, sizeof(val)); - } - - memset(line, 0, sizeof(line)); - } - - print_index(array, n_entries, out); - - if( offset > 0 ) - { - print_uint32(offset, out); - fsync(fileno(out)); - fclose(out); - } - else - { - fclose(out); - unlink(argv[2]); - } - - fclose(in); - return(0); -} diff --git a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.c b/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.c deleted file mode 100644 index 27205a7228..0000000000 --- a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.c +++ /dev/null @@ -1,328 +0,0 @@ -/* - * lmo - Lua Machine Objects - Base functions - * - * Copyright (C) 2009-2010 Jo-Philipp Wich - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "template_lmo.h" - -/* - * Hash function from http://www.azillionmonkeys.com/qed/hash.html - * Copyright (C) 2004-2008 by Paul Hsieh - */ - -uint32_t sfh_hash(const char *data, int len) -{ - uint32_t hash = len, tmp; - int rem; - - if (len <= 0 || data == NULL) return 0; - - rem = len & 3; - len >>= 2; - - /* Main loop */ - for (;len > 0; len--) { - hash += sfh_get16(data); - tmp = (sfh_get16(data+2) << 11) ^ hash; - hash = (hash << 16) ^ tmp; - data += 2*sizeof(uint16_t); - hash += hash >> 11; - } - - /* Handle end cases */ - switch (rem) { - case 3: hash += sfh_get16(data); - hash ^= hash << 16; - hash ^= data[sizeof(uint16_t)] << 18; - hash += hash >> 11; - break; - case 2: hash += sfh_get16(data); - hash ^= hash << 11; - hash += hash >> 17; - break; - case 1: hash += *data; - hash ^= hash << 10; - hash += hash >> 1; - } - - /* Force "avalanching" of final 127 bits */ - hash ^= hash << 3; - hash += hash >> 5; - hash ^= hash << 4; - hash += hash >> 17; - hash ^= hash << 25; - hash += hash >> 6; - - return hash; -} - -uint32_t lmo_canon_hash(const char *str, int len) -{ - char res[4096]; - char *ptr, prev; - int off; - - if (!str || len >= sizeof(res)) - return 0; - - for (prev = ' ', ptr = res, off = 0; off < len; prev = *str, off++, str++) - { - if (isspace(*str)) - { - if (!isspace(prev)) - *ptr++ = ' '; - } - else - { - *ptr++ = *str; - } - } - - if ((ptr > res) && isspace(*(ptr-1))) - ptr--; - - return sfh_hash(res, ptr - res); -} - -lmo_archive_t * lmo_open(const char *file) -{ - int in = -1; - uint32_t idx_offset = 0; - struct stat s; - - lmo_archive_t *ar = NULL; - - if (stat(file, &s) == -1) - goto err; - - if ((in = open(file, O_RDONLY)) == -1) - goto err; - - if ((ar = (lmo_archive_t *)malloc(sizeof(*ar))) != NULL) - { - memset(ar, 0, sizeof(*ar)); - - ar->fd = in; - ar->size = s.st_size; - - fcntl(ar->fd, F_SETFD, fcntl(ar->fd, F_GETFD) | FD_CLOEXEC); - - if ((ar->mmap = mmap(NULL, ar->size, PROT_READ, MAP_SHARED, ar->fd, 0)) == MAP_FAILED) - goto err; - - idx_offset = ntohl(*((const uint32_t *) - (ar->mmap + ar->size - sizeof(uint32_t)))); - - if (idx_offset >= ar->size) - goto err; - - ar->index = (lmo_entry_t *)(ar->mmap + idx_offset); - ar->length = (ar->size - idx_offset - sizeof(uint32_t)) / sizeof(lmo_entry_t); - ar->end = ar->mmap + ar->size; - - return ar; - } - -err: - if (in > -1) - close(in); - - if (ar != NULL) - { - if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED)) - munmap(ar->mmap, ar->size); - - free(ar); - } - - return NULL; -} - -void lmo_close(lmo_archive_t *ar) -{ - if (ar != NULL) - { - if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED)) - munmap(ar->mmap, ar->size); - - close(ar->fd); - free(ar); - - ar = NULL; - } -} - - -lmo_catalog_t *_lmo_catalogs = NULL; -lmo_catalog_t *_lmo_active_catalog = NULL; - -int lmo_load_catalog(const char *lang, const char *dir) -{ - DIR *dh = NULL; - char pattern[16]; - char path[PATH_MAX]; - struct dirent *de = NULL; - - lmo_archive_t *ar = NULL; - lmo_catalog_t *cat = NULL; - - if (!lmo_change_catalog(lang)) - return 0; - - if (!dir || !(dh = opendir(dir))) - goto err; - - if (!(cat = malloc(sizeof(*cat)))) - goto err; - - memset(cat, 0, sizeof(*cat)); - - snprintf(cat->lang, sizeof(cat->lang), "%s", lang); - snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang); - - while ((de = readdir(dh)) != NULL) - { - if (!fnmatch(pattern, de->d_name, 0)) - { - snprintf(path, sizeof(path), "%s/%s", dir, de->d_name); - ar = lmo_open(path); - - if (ar) - { - ar->next = cat->archives; - cat->archives = ar; - } - } - } - - closedir(dh); - - cat->next = _lmo_catalogs; - _lmo_catalogs = cat; - - if (!_lmo_active_catalog) - _lmo_active_catalog = cat; - - return 0; - -err: - if (dh) closedir(dh); - if (cat) free(cat); - - return -1; -} - -int lmo_change_catalog(const char *lang) -{ - lmo_catalog_t *cat; - - for (cat = _lmo_catalogs; cat; cat = cat->next) - { - if (!strncmp(cat->lang, lang, sizeof(cat->lang))) - { - _lmo_active_catalog = cat; - return 0; - } - } - - return -1; -} - -static lmo_entry_t * lmo_find_entry(lmo_archive_t *ar, uint32_t hash) -{ - unsigned int m, l, r; - uint32_t k; - - l = 0; - r = ar->length - 1; - - while (1) - { - m = l + ((r - l) / 2); - - if (r < l) - break; - - k = ntohl(ar->index[m].key_id); - - if (k == hash) - return &ar->index[m]; - - if (k > hash) - { - if (!m) - break; - - r = m - 1; - } - else - { - l = m + 1; - } - } - - return NULL; -} - -int lmo_translate(const char *key, int keylen, char **out, int *outlen) -{ - uint32_t hash; - lmo_entry_t *e; - lmo_archive_t *ar; - - if (!key || !_lmo_active_catalog) - return -2; - - hash = lmo_canon_hash(key, keylen); - - for (ar = _lmo_active_catalog->archives; ar; ar = ar->next) - { - if ((e = lmo_find_entry(ar, hash)) != NULL) - { - *out = ar->mmap + ntohl(e->offset); - *outlen = ntohl(e->length); - return 0; - } - } - - return -1; -} - -void lmo_close_catalog(const char *lang) -{ - lmo_archive_t *ar, *next; - lmo_catalog_t *cat, *prev; - - for (prev = NULL, cat = _lmo_catalogs; cat; prev = cat, cat = cat->next) - { - if (!strncmp(cat->lang, lang, sizeof(cat->lang))) - { - if (prev) - prev->next = cat->next; - else - _lmo_catalogs = cat->next; - - for (ar = cat->archives; ar; ar = next) - { - next = ar->next; - lmo_close(ar); - } - - free(cat); - break; - } - } -} diff --git a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.h b/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.h deleted file mode 100644 index 57f59aa56b..0000000000 --- a/package/ntlf9t/luci-app-udp2raw/tools/po2lmo/src/template_lmo.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * lmo - Lua Machine Objects - General header - * - * Copyright (C) 2009-2012 Jo-Philipp Wich - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _TEMPLATE_LMO_H_ -#define _TEMPLATE_LMO_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if (defined(__GNUC__) && defined(__i386__)) -#define sfh_get16(d) (*((const uint16_t *) (d))) -#else -#define sfh_get16(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\ - +(uint32_t)(((const uint8_t *)(d))[0]) ) -#endif - - -struct lmo_entry { - uint32_t key_id; - uint32_t val_id; - uint32_t offset; - uint32_t length; -} __attribute__((packed)); - -typedef struct lmo_entry lmo_entry_t; - - -struct lmo_archive { - int fd; - int length; - uint32_t size; - lmo_entry_t *index; - char *mmap; - char *end; - struct lmo_archive *next; -}; - -typedef struct lmo_archive lmo_archive_t; - - -struct lmo_catalog { - char lang[6]; - struct lmo_archive *archives; - struct lmo_catalog *next; -}; - -typedef struct lmo_catalog lmo_catalog_t; - - -uint32_t sfh_hash(const char *data, int len); -uint32_t lmo_canon_hash(const char *data, int len); - -lmo_archive_t * lmo_open(const char *file); -void lmo_close(lmo_archive_t *ar); - - -extern lmo_catalog_t *_lmo_catalogs; -extern lmo_catalog_t *_lmo_active_catalog; - -int lmo_load_catalog(const char *lang, const char *dir); -int lmo_change_catalog(const char *lang); -int lmo_translate(const char *key, int keylen, char **out, int *outlen); -void lmo_close_catalog(const char *lang); - -#endif