project rename: udpfoward -> udpgate

diff --git a/AUTHORS b/AUTHORS
index 11ab2fa..4a773f7 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-Jan Kratochvil <project-udpforward@jankratochvil.net>
+Jan Kratochvil <project-udpgate@jankratochvil.net>

                http://www.jankratochvil.net/
                http://www.jankratochvil.net/

diff --git a/Makefile-head.am b/Makefile-head.am
index 2806a91..d79592f 100644 (file)
--- a/Makefile-head.am
+++ b/Makefile-head.am
@@ -1,6 +1,6 @@
 # $Id$
 # automake source include to the begin of all Makefile.am's
 # $Id$
 # automake source include to the begin of all Makefile.am's

-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/Makefile.am b/Makefile.am
index a3c398a..e1e04e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 # automake source for the toplevel Makefile 
 # $Id$
 # automake source for the toplevel Makefile 

-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -30,7 +30,7 @@ SUBDIRS=macros src po
 EXTRA_DIST+= \
                INSTALL \
                mkinstalldirs \
 EXTRA_DIST+= \
                INSTALL \
                mkinstalldirs \

-               udpforward.spec.in \
+               udpgate.spec.in \

                Makefile-head.am \
                autogen.pl \
                .vimrc \
                Makefile-head.am \
                autogen.pl \
                .vimrc \

diff --git a/NEWS b/NEWS
index 5220e17..6c6291f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 $Id$
 
 
 $Id$
 
 

-NEWS for udpforward-1.0
+NEWS for udpgate-1.0

 -----------------------
 
 * Project build framework done
 -----------------------
 
 * Project build framework done

diff --git a/README b/README
index d449948..1e5be6e 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 $Id$
 
 
 $Id$
 
 

-UDP Forwarder
--------------
+UDP Gateway
+-----------

 
 Utility will transparently provide virtual MMS center on your personal
 computer.  As GSM operators usually block all the alternate service gateways
 
 Utility will transparently provide virtual MMS center on your personal
 computer.  As GSM operators usually block all the alternate service gateways


@@ -13,7 +13,7 @@ customers.
 Project Home
 ------------
 
 Project Home
 ------------
 

-http://www.jankratochvil.net/project/udpforward/
+http://www.jankratochvil.net/project/udpgate/

 
 
 CVS Bleeding Edge
 
 
 CVS Bleeding Edge


@@ -21,11 +21,11 @@ CVS Bleeding Edge
 
 cvs -d :pserver:pserver@cvs.jankratochvil.net:/cvs login
     Just hit ENTER (empty password)
 
 cvs -d :pserver:pserver@cvs.jankratochvil.net:/cvs login
     Just hit ENTER (empty password)

-cvs -d :pserver:pserver@cvs.jankratochvil.net:/cvs -z3 checkout udpforward
-cd udpforward
+cvs -d :pserver:pserver@cvs.jankratochvil.net:/cvs -z3 checkout udpgate
+cd udpgate

 ./autogen.pl
 make
 ./autogen.pl
 make

-./src/udpforward
+./src/udpgate

 
 
 Installation
 
 
 Installation

diff --git a/autogen.pl b/autogen.pl
index 20d5575..1386fee 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -2,7 +2,7 @@
 # 
 # $Id$
 # Run to generate the initial Makefiles etc. after CVS checkout.
 # 
 # $Id$
 # Run to generate the initial Makefiles etc. after CVS checkout.

-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -31,8 +31,8 @@ use Carp qw(cluck confess);
 
 
 AutoGen->run(
 
 
 AutoGen->run(

-               "name"=>"udpforward",
-               "COPYRIGHT_HOLDER"=>'Jan Kratochvil <project-udpforward@jankratochvil.net>',
+               "name"=>"udpgate",
+               "COPYRIGHT_HOLDER"=>'Jan Kratochvil <project-udpgate@jankratochvil.net>',

                "ARGV"=>\@ARGV,
                "clean"=>[qw(
                                .include_test_false.c
                "ARGV"=>\@ARGV,
                "clean"=>[qw(
                                .include_test_false.c


@@ -41,7 +41,7 @@ AutoGen->run(
                                ./ChangeLog.bak
                                ./debian/changelog
                                ./doc/*-pod.*
                                ./ChangeLog.bak
                                ./debian/changelog
                                ./doc/*-pod.*

-                               ./src/udpforward
+                               ./src/udpgate

                                ./src/ui-gnome-callbacks.[ch]
                                ./src/ui-gnome-interface.[ch]
                                ./src/ui-gnome-support.[ch]
                                ./src/ui-gnome-callbacks.[ch]
                                ./src/ui-gnome-interface.[ch]
                                ./src/ui-gnome-support.[ch]

diff --git a/configure.ac b/configure.ac
index 5fc889d..dd7caf8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # $Id$
 # Source file to generate "./configure" to prepare package for compilation
 # $Id$
 # Source file to generate "./configure" to prepare package for compilation

-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -21,7 +21,7 @@ dnl 2.53 for AM_GLIB_GNU_GETTEXT:
 AC_PREREQ(2.53)
 dnl Not yet present in: Red Hat autoconf-2.57-3
 dnl AC_CONFIG_MACRO_DIR(macros)
 AC_PREREQ(2.53)
 dnl Not yet present in: Red Hat autoconf-2.57-3
 dnl AC_CONFIG_MACRO_DIR(macros)

-AM_INIT_AUTOMAKE(udpforward,1.0cvs)
+AM_INIT_AUTOMAKE(udpgate,1.0cvs)

 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Prevent "AC_TRY_COMPILE was called before AC_ISC_POSIX":
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Prevent "AC_TRY_COMPILE was called before AC_ISC_POSIX":


@@ -72,25 +72,25 @@ AC_PATH_PROGS(POD2MAN,pod2man)
 AM_CONDITIONAL(HAVE_POD2MAN,[ test -n "$POD2MAN" ])
 if test x$enable_man_pages = xyes;then
        if test -z "$POD2MAN";then
 AM_CONDITIONAL(HAVE_POD2MAN,[ test -n "$POD2MAN" ])
 if test x$enable_man_pages = xyes;then
        if test -z "$POD2MAN";then

-               AC_MSG_ERROR([udpforward requires pod2man(1) for man pages; try --disable-man-pages.])
+               AC_MSG_ERROR([udpgate requires pod2man(1) for man pages; try --disable-man-pages.])

        fi
        if test -z "$PERL";then
        fi
        if test -z "$PERL";then

-               AC_MSG_ERROR([udpforward requires perl(1) for man pages; try --disable-man-pages.])
+               AC_MSG_ERROR([udpgate requires perl(1) for man pages; try --disable-man-pages.])

        fi
 elif test x$enable_man_pages != xno;then
        if test -z "$POD2MAN";then
        fi
 elif test x$enable_man_pages != xno;then
        if test -z "$POD2MAN";then

-               AC_MSG_WARN([udpforward requires pod2man(1) for man pages by --enable-man-pages; mans will not be installed.])
+               AC_MSG_WARN([udpgate requires pod2man(1) for man pages by --enable-man-pages; mans will not be installed.])

        fi
        if test -z "$PERL";then
        fi
        if test -z "$PERL";then

-               AC_MSG_WARN([udpforward requires perl(1) for man pages by --enable-man-pages; mans will not be installed.])
+               AC_MSG_WARN([udpgate requires perl(1) for man pages by --enable-man-pages; mans will not be installed.])

        fi
 fi
 AM_CONDITIONAL(ENABLE_MAN_PAGES,[ test x$enable_man_pages != xno -a -n "$POD2MAN" -a -n "$PERL" ])
 
 dnl Separate 'acconfig.h' is no longer recommended by autoconf
 AH_TOP([
        fi
 fi
 AM_CONDITIONAL(ENABLE_MAN_PAGES,[ test x$enable_man_pages != xno -a -n "$POD2MAN" -a -n "$PERL" ])
 
 dnl Separate 'acconfig.h' is no longer recommended by autoconf
 AH_TOP([

-#ifndef _UDPFORWARD_CONFIG_H
-#define _UDPFORWARD_CONFIG_H 1
+#ifndef _UDPGATE_CONFIG_H
+#define _UDPGATE_CONFIG_H 1

 ])
 AH_BOTTOM([
 /* Do not place any stuff to AH_TOP as some of its includes
 ])
 AH_BOTTOM([
 /* Do not place any stuff to AH_TOP as some of its includes


@@ -118,10 +118,10 @@ AH_BOTTOM([
 #endif /* !ENABLE_NLS */
 
 #include <glib/gtypes.h>       /* for 'gchar' */
 #endif /* !ENABLE_NLS */
 
 #include <glib/gtypes.h>       /* for 'gchar' */

-#define G_LOG_DOMAIN ((const gchar *)"UDPForward")
+#define G_LOG_DOMAIN ((const gchar *)"UDPGate")

 
 /**
 
 /**

- * udpforward_newn:
+ * udpgate_newn:

  * @objp: Variable with the pointer to the objects wished to be allocated.
  * Original value is discarded.
  * @n: Numbers of objects to be allocated. Value %0 is permitted (%NULL assignment effect).
  * @objp: Variable with the pointer to the objects wished to be allocated.
  * Original value is discarded.
  * @n: Numbers of objects to be allocated. Value %0 is permitted (%NULL assignment effect).


@@ -132,32 +132,32 @@ AH_BOTTOM([
  * @Returns: Initialized @objp value as the memory of size #sizeof(typeof(*objp))*n.
  * Value %NULL is returned iff @n==%0;
  */
  * @Returns: Initialized @objp value as the memory of size #sizeof(typeof(*objp))*n.
  * Value %NULL is returned iff @n==%0;
  */

-#define udpforward_newn(objp,n) ((objp)=g_new(typeof(*(objp)),(n)))
+#define udpgate_newn(objp,n) ((objp)=g_new(typeof(*(objp)),(n)))

 
 /**
 
 /**

- * udpforward_new:
+ * udpgate_new:

  * @objp: Variable with the pointer to the object wished to be allocated.
  * Original value is discarded.
  *
  * Macro to allocate one object of type *@objp and to assign the resulting pointer to @objp.
  * @objp: Variable with the pointer to the object wished to be allocated.
  * Original value is discarded.
  *
  * Macro to allocate one object of type *@objp and to assign the resulting pointer to @objp.

- * Allocated memory may contain garbage. Equivalent to udpforward_newn(objp,1) call.
+ * Allocated memory may contain garbage. Equivalent to udpgate_newn(objp,1) call.

  *
  * @Returns: Initialized @objp value as the memory of size #sizeof(typeof(*objp)).
  * Value %NULL is never returned.
  */
  *
  * @Returns: Initialized @objp value as the memory of size #sizeof(typeof(*objp)).
  * Value %NULL is never returned.
  */

-#define udpforward_new(objp) (udpforward_newn((objp),1))
+#define udpgate_new(objp) (udpgate_newn((objp),1))

 
 /**
 
 /**

- * UDPFORWARD_MEMZERO:
+ * UDPGATE_MEMZERO:

  * @objp: Pointer to the variable to be cleared.
  *
  * Clears the sizeof(*@objp) bytes of the given pointer with memset().
  * Pass _pointer_ to the object to be cleared.
  */
  * @objp: Pointer to the variable to be cleared.
  *
  * Clears the sizeof(*@objp) bytes of the given pointer with memset().
  * Pass _pointer_ to the object to be cleared.
  */

-#define UDPFORWARD_MEMZERO(objp) (memset((objp),0,sizeof(*(objp))))
+#define UDPGATE_MEMZERO(objp) (memset((objp),0,sizeof(*(objp))))

 
 /**
 
 /**

- * udpforward_printf_alloca:
+ * udpgate_printf_alloca:

  * @format: Format string. See the sprintf() documentation.
  * @args...: Arguments for @format. See the sprintf() documentation.
  *
  * @format: Format string. See the sprintf() documentation.
  * @args...: Arguments for @format. See the sprintf() documentation.
  *


@@ -167,16 +167,16 @@ AH_BOTTOM([
  *
  * @Returns: Formatted output string located in g_alloca() memory.
  */
  *
  * @Returns: Formatted output string located in g_alloca() memory.
  */

-#define udpforward_printf_alloca(format,args...) ({ \
-               gsize _udpforward_printf_alloca_size=udpforward_nv_printf_string_upper_bound((format) , ## args); \
-               gchar *_udpforward_printf_alloca_r=g_alloca(_udpforward_printf_alloca_size); \
-               g_snprintf(_udpforward_printf_alloca_r,_udpforward_printf_alloca_size,(format) , ## args); \
-               (const gchar *)_udpforward_printf_alloca_r; \
+#define udpgate_printf_alloca(format,args...) ({ \
+               gsize _udpgate_printf_alloca_size=udpgate_nv_printf_string_upper_bound((format) , ## args); \
+               gchar *_udpgate_printf_alloca_r=g_alloca(_udpgate_printf_alloca_size); \
+               g_snprintf(_udpgate_printf_alloca_r,_udpgate_printf_alloca_size,(format) , ## args); \
+               (const gchar *)_udpgate_printf_alloca_r; \

                })
 #include <stdarg.h>
 #include <glib/gmessages.h>    /* for g_printf_string_upper_bound() */
                })
 #include <stdarg.h>
 #include <glib/gmessages.h>    /* for g_printf_string_upper_bound() */

-static inline gsize udpforward_nv_printf_string_upper_bound(const gchar *format,...) G_GNUC_PRINTF(1,0) G_GNUC_UNUSED;
-static inline gsize udpforward_nv_printf_string_upper_bound(const gchar *format,...)
+static inline gsize udpgate_nv_printf_string_upper_bound(const gchar *format,...) G_GNUC_PRINTF(1,0) G_GNUC_UNUSED;
+static inline gsize udpgate_nv_printf_string_upper_bound(const gchar *format,...)

 {
 va_list ap;
 gsize r;
 {
 va_list ap;
 gsize r;


@@ -187,17 +187,17 @@ gsize r;
        return r;
 }
 
        return r;
 }
 

-#endif /* !_UDPFORWARD_CONFIG_H */
+#endif /* !_UDPGATE_CONFIG_H */

 ])
 
 dnl Do not use PKG_CHECK_MODULES() as it would not set 'GLIB_GENMARSHAL' etc.
 ])
 
 dnl Do not use PKG_CHECK_MODULES() as it would not set 'GLIB_GENMARSHAL' etc.

-AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([UDPForward requires glib-2.0 library.])],[])
+AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([UDPGate requires glib-2.0 library.])],[])

 dnl Force glib for the whole package
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 LIBS="$LIBS $GLIB_LIBS"
 
 dnl popt
 dnl Force glib for the whole package
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 LIBS="$LIBS $GLIB_LIBS"
 
 dnl popt

-AC_CHECK_LIB(popt,poptParseArgvString,[POPT_LIBS="-lpopt"],[AC_MSG_ERROR([UDPForward requires popt library.])])
+AC_CHECK_LIB(popt,poptParseArgvString,[POPT_LIBS="-lpopt"],[AC_MSG_ERROR([UDPGate requires popt library.])])

 AC_SUBST(POPT_LIBS)
 
 GLADE_W_INIT([
 AC_SUBST(POPT_LIBS)
 
 GLADE_W_INIT([


@@ -225,8 +225,8 @@ AC_SUBST(LIBS)
 dnl "Makefile" output files MUST have pathnames incl./excl. "./" prefix as specified!
 dnl FIXME: Why the rule above was written here?
 AC_OUTPUT([
 dnl "Makefile" output files MUST have pathnames incl./excl. "./" prefix as specified!
 dnl FIXME: Why the rule above was written here?
 AC_OUTPUT([

-udpforward.spec
-./src/udpforward.pod.pl
+udpgate.spec
+./src/udpgate.pod.pl

 ./po/Makefile.in
 ./macros/glade-w.sh
 Makefile
 ./po/Makefile.in
 ./macros/glade-w.sh
 Makefile

diff --git a/cvs2cl-usermap b/cvs2cl-usermap
index dbb02b2..5cd5bc2 100644 (file)
--- a/cvs2cl-usermap
+++ b/cvs2cl-usermap
@@ -1,2 +1,2 @@
-short:Jan Kratochvil <project-udpforward@jankratochvil.net>
-lace:Jan Kratochvil <project-udpforward@jankratochvil.net>
+short:Jan Kratochvil <project-udpgate@jankratochvil.net>
+lace:Jan Kratochvil <project-udpgate@jankratochvil.net>

diff --git a/po/cs.po b/po/cs.po
index f9a662d..e03f299 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,6 +1,6 @@
 # $Id$
 # "cs" (Czech) language file
 # $Id$
 # "cs" (Czech) language file

-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -16,10 +16,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 msgid ""
 msgstr ""
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 msgid ""
 msgstr ""

-"Project-Id-Version: udpforward 1.0\n"
+"Project-Id-Version: udpgate 1.0\n"

 "POT-Creation-Date: 2004-05-09 13:23+0200\n"
 "PO-Revision-Date: 2004-05-09 13:23+0200\n"
 "POT-Creation-Date: 2004-05-09 13:23+0200\n"
 "PO-Revision-Date: 2004-05-09 13:23+0200\n"

-"Last-Translator: Jan Kratochvil <project-udpforward@jankratochvil.net>\n"
+"Last-Translator: Jan Kratochvil <project-udpgate@jankratochvil.net>\n"

 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/src/Makefile.am b/src/Makefile.am
index 93b4ca4..e7c8050 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 # $Id$

-# automake source for UDP forwarder Makefile
-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# automake source for UDP Gateway Makefile
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -29,7 +29,7 @@ GLADE_OUT= \
                ui-gnome-support.c \
                ui-gnome-support.h
 
                ui-gnome-support.c \
                ui-gnome-support.h
 

-udpforward_SOURCES= \
+udpgate_SOURCES= \

                main.c \
                main.h \
                network.c \
                main.c \
                main.h \
                network.c \


@@ -41,10 +41,10 @@ udpforward_SOURCES= \
 EXTRA_DIST+= \
                $(GLADE_IN)
 
 EXTRA_DIST+= \
                $(GLADE_IN)
 

-udpforward_CFLAGS=
-udpforward_LDADD=
+udpgate_CFLAGS=
+udpgate_LDADD=

 
 

-udpforward-ui-gnome-interface.$(OBJEXT): ui-gnome-callbacks.h
+udpgate-ui-gnome-interface.$(OBJEXT): ui-gnome-callbacks.h

 
 if HAVE_GLADE_WRITESOURCE
 # touch(1) as 'ui-gnome-callbacks.h' are not overwritten if not changed:
 
 if HAVE_GLADE_WRITESOURCE
 # touch(1) as 'ui-gnome-callbacks.h' are not overwritten if not changed:


@@ -59,7 +59,7 @@ CLEANFILES+= \
                ui-gnome.glade.bak \
                ui-gnome.gladep.bak
 
                ui-gnome.glade.bak \
                ui-gnome.gladep.bak
 

-udpforward_LDADD+= $(POPT_LIBS) $(INTLLIBS)
+udpgate_LDADD+= $(POPT_LIBS) $(INTLLIBS)

 
 # FIXME: /usr/include/gtk-2.0/gtk/gtkitemfactory.h:51: warning: function declaration isn't a prototype
 # /* We use () here to mean unspecified arguments. This is deprecated
 
 # FIXME: /usr/include/gtk-2.0/gtk/gtkitemfactory.h:51: warning: function declaration isn't a prototype
 # /* We use () here to mean unspecified arguments. This is deprecated


@@ -69,14 +69,14 @@ udpforward_LDADD+= $(POPT_LIBS) $(INTLLIBS)
 #  */
 # typedef void  (*GtkItemFactoryCallback)  ();
 # We cannot put '-Wno-strict-prototypes' as we get always overriden by $(CFLAGS) !
 #  */
 # typedef void  (*GtkItemFactoryCallback)  ();
 # We cannot put '-Wno-strict-prototypes' as we get always overriden by $(CFLAGS) !

-udpforward_CFLAGS+=$(GNOMEUI_CFLAGS)
-udpforward_LDADD +=$(GNOMEUI_LIBS)
+udpgate_CFLAGS+=$(GNOMEUI_CFLAGS)
+udpgate_LDADD +=$(GNOMEUI_LIBS)

 
 

-bin_PROGRAMS+=udpforward
+bin_PROGRAMS+=udpgate

 
 

-EXTRA_DIST+=udpforward.pod.pl.in
-CLEANFILES+=udpforward.pod udpforward.1
+EXTRA_DIST+=udpgate.pod.pl.in
+CLEANFILES+=udpgate.pod udpgate.1

 if ENABLE_MAN_PAGES
 if ENABLE_MAN_PAGES

-udpforward_man_cond=udpforward.1
+udpgate_man_cond=udpgate.1

 endif
 endif

-man_MANS=$(udpforward_man_cond)
+man_MANS=$(udpgate_man_cond)

diff --git a/src/main.c b/src/main.c
index aba413b..4dca6b0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /* $Id$
 /* $Id$

- * UDP forwarding utility
- * Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+ * UDP Gateway utility
+ * Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -38,7 +38,7 @@ static int optarg_text;
 
 static const struct poptOption popt_table[]={
 
 
 static const struct poptOption popt_table[]={
 

-#define UDPFORWARD_POPT(shortname,longname,argInfoP,argP,valP,descripP,argDescripP) \
+#define UDPGATE_POPT(shortname,longname,argInfoP,argP,valP,descripP,argDescripP) \

                { \
                        longName: (longname), \
                        shortName: (shortname), \
                { \
                        longName: (longname), \
                        shortName: (shortname), \


@@ -49,11 +49,11 @@ static const struct poptOption popt_table[]={
                        argDescrip: (argDescripP), \
                }
 
                        argDescrip: (argDescripP), \
                }
 

-               UDPFORWARD_POPT(0  ,"text"            ,POPT_ARG_NONE  ,&optarg_text   ,0,
+               UDPGATE_POPT(0  ,"text"            ,POPT_ARG_NONE  ,&optarg_text   ,0,

                                N_("Disable Gnome UI; --text must be first argument"),NULL),
                                N_("Disable Gnome UI; --text must be first argument"),NULL),

-               UDPFORWARD_POPT('v',"verbose"         ,POPT_ARG_NONE  ,&optarg_verbose,0,N_("Display additional debug information"),NULL),
+               UDPGATE_POPT('v',"verbose"         ,POPT_ARG_NONE  ,&optarg_verbose,0,N_("Display additional debug information"),NULL),

 
 

-#undef UDPFORWARD_POPT
+#undef UDPGATE_POPT

                POPT_TABLEEND
                };
 
                POPT_TABLEEND
                };
 

diff --git a/src/network.c b/src/network.c
index 30fde92..0e516f4 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -1,6 +1,6 @@
 /* $Id$
 /* $Id$

- * UDP forwarding utility
- * Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+ * UDP Gateway utility network layer
+ * Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -39,7 +39,7 @@
 
 
 /* Config: */
 
 
 /* Config: */

-#define NETWORK_PATHNAME_PID "/var/run/udpforward.pid"
+#define NETWORK_PATHNAME_PID "/var/run/udpgate.pid"

 #define SOCK_SOURCE_CHECK_EVENTS (G_IO_IN)     /* |G_IO_PRI */
 #define SOCK_SOURCE_CHECK_REVENTS (SOCK_SOURCE_CHECK_EVENTS)   /* |G_IO_ERR|G_IO_HUP|G_IO_NVAL */
 #define SERVER_INADDR 0x511F02EA       /* paulina.vellum.cz = 81.31.2.234 */
 #define SOCK_SOURCE_CHECK_EVENTS (G_IO_IN)     /* |G_IO_PRI */
 #define SOCK_SOURCE_CHECK_REVENTS (SOCK_SOURCE_CHECK_EVENTS)   /* |G_IO_ERR|G_IO_HUP|G_IO_NVAL */
 #define SERVER_INADDR 0x511F02EA       /* paulina.vellum.cz = 81.31.2.234 */


@@ -193,7 +193,7 @@ GList *clientl;
                        client->sockaddr_in_from=sockaddr_in_from;
                        }
                client_touch(client);
                        client->sockaddr_in_from=sockaddr_in_from;
                        }
                client_touch(client);

-               UDPFORWARD_MEMZERO(&sockaddr_in_server);
+               UDPGATE_MEMZERO(&sockaddr_in_server);

                sockaddr_in_server.sin_family=AF_INET;
                sockaddr_in_server.sin_port=htons(SERVER_PORT);
                sockaddr_in_server.sin_addr.s_addr=htonl(SERVER_INADDR);
                sockaddr_in_server.sin_family=AF_INET;
                sockaddr_in_server.sin_port=htons(SERVER_PORT);
                sockaddr_in_server.sin_addr.s_addr=htonl(SERVER_INADDR);


@@ -353,7 +353,7 @@ int sock;
                return NULL;
                }
 
                return NULL;
                }
 

-       udpforward_new(client);
+       udpgate_new(client);

        client->gpollfd.fd=sock;
        client->gpollfd.events=SOCK_SOURCE_CHECK_EVENTS;
        client->gpollfd.revents=0;
        client->gpollfd.fd=sock;
        client->gpollfd.events=SOCK_SOURCE_CHECK_EVENTS;
        client->gpollfd.revents=0;


@@ -398,7 +398,7 @@ struct sockaddr_in sockaddr_in;
        g_assert(master==NULL);
        if (!(master=client_new()))
                return FALSE;
        g_assert(master==NULL);
        if (!(master=client_new()))
                return FALSE;

-       UDPFORWARD_MEMZERO(&sockaddr_in);
+       UDPGATE_MEMZERO(&sockaddr_in);

        sockaddr_in.sin_family=AF_INET;
        sockaddr_in.sin_port=htons(port);
        sockaddr_in.sin_addr.s_addr=INADDR_ANY;
        sockaddr_in.sin_family=AF_INET;
        sockaddr_in.sin_port=htons(port);
        sockaddr_in.sin_addr.s_addr=INADDR_ANY;


@@ -428,7 +428,7 @@ int errno_save;
        kill(daemon_pid,SIGKILL);
        errno_save=errno;
        if (errno_save)  {
        kill(daemon_pid,SIGKILL);
        errno_save=errno;
        if (errno_save)  {

-               g_warning(udpforward_printf_alloca(_("Unable to stop the daemon at PID %d: %s"),
+               g_warning(udpgate_printf_alloca(_("Unable to stop the daemon at PID %d: %s"),

                                (int)daemon_pid,strerror(errno_save)));
                return FALSE;
                }
                                (int)daemon_pid,strerror(errno_save)));
                return FALSE;
                }

diff --git a/src/network.h b/src/network.h
index c4f4006..9d621fc 100644 (file)
--- a/src/network.h
+++ b/src/network.h
@@ -1,6 +1,6 @@
 /* $Id$
 /* $Id$

- * Include file for the core network functionality of UDPForward
- * Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+ * Include file for the core network functionality of UDPGate
+ * Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -17,8 +17,8 @@
  */
 
 
  */
 
 

-#ifndef _UDPFORWARD_NETWORK_H
-#define _UDPFORWARD_NETWORK_H 1
+#ifndef _UDPGATE_NETWORK_H
+#define _UDPGATE_NETWORK_H 1

 
 
 #include <glib/gtypes.h>
 
 
 #include <glib/gtypes.h>


@@ -35,4 +35,4 @@ gboolean network_stop(void);
 G_END_DECLS
 
 
 G_END_DECLS
 
 

-#endif /* _UDPFORWARD_NETWORK_H */
+#endif /* _UDPGATE_NETWORK_H */

diff --git a/src/udpforward.pod.pl.in b/src/udpgate.pod.pl.in
similarity index 92%
rename from src/udpforward.pod.pl.in
rename to src/udpgate.pod.pl.in
index 99f793a..b178736 100644 (file)
--- a/src/udpforward.pod.pl.in
+++ b/src/udpgate.pod.pl.in
@@ -1,8 +1,8 @@
 #! /usr/bin/perl
 # 
 # $Id$
 #! /usr/bin/perl
 # 
 # $Id$

-# perlpod(1) source for udpforward(1) man page
-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# perlpod(1) source for udpgate(1) man page
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/src/ui-gnome.c b/src/ui-gnome.c
index 3601774..ebeb4e0 100644 (file)
--- a/src/ui-gnome.c
+++ b/src/ui-gnome.c
@@ -1,6 +1,6 @@
 /* $Id$
  * Gnome user interface
 /* $Id$
  * Gnome user interface

- * Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+ * Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -65,9 +65,9 @@ pid_t daemon_pid;
        gtk_widget_set_sensitive(GTK_WIDGET(PortHBox)   ,!daemon_running);
        if (daemon_running)
                gnome_appbar_set_status(AppBar,
        gtk_widget_set_sensitive(GTK_WIDGET(PortHBox)   ,!daemon_running);
        if (daemon_running)
                gnome_appbar_set_status(AppBar,

-                               udpforward_printf_alloca(_("udpforward daemon running as PID %d."),(int)daemon_pid));
+                               udpgate_printf_alloca(_("udpgate daemon running as PID %d."),(int)daemon_pid));

        else
        else

-               gnome_appbar_set_status(AppBar,_("No udpforward daemon currently running."));
+               gnome_appbar_set_status(AppBar,_("No udpgate daemon currently running."));

 }
 
 static gboolean daemon_check_timeout_func(gpointer data /* unused */)
 }
 
 static gboolean daemon_check_timeout_func(gpointer data /* unused */)


@@ -84,7 +84,7 @@ void on_PortButtonRandom_clicked(GtkButton *button,gpointer user_data)
        if ((pid_t)-1!=is_daemon_running())
                return;
        gtk_entry_set_text(PortEntry,
        if ((pid_t)-1!=is_daemon_running())
                return;
        gtk_entry_set_text(PortEntry,

-                       udpforward_printf_alloca("%d",(int)g_random_int_range(PORT_RANGE_BEGIN,PORT_RANGE_END)));
+                       udpgate_printf_alloca("%d",(int)g_random_int_range(PORT_RANGE_BEGIN,PORT_RANGE_END)));

 }
 
 void on_AutostartCheckButton_toggled(GtkToggleButton *togglebutton,gpointer user_data)
 }
 
 void on_AutostartCheckButton_toggled(GtkToggleButton *togglebutton,gpointer user_data)

diff --git a/src/ui-gnome.glade b/src/ui-gnome.glade
index 50e8396..2f66579 100644 (file)
--- a/src/ui-gnome.glade
+++ b/src/ui-gnome.glade
@@ -7,7 +7,7 @@
 
 <widget class="GnomeApp" id="App">
   <property name="visible">True</property>
 
 <widget class="GnomeApp" id="App">
   <property name="visible">True</property>

-  <property name="title" translatable="yes">UDP Forwarder</property>
+  <property name="title" translatable="yes">UDP Gateway</property>

   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>

diff --git a/src/ui-gnome.gladep b/src/ui-gnome.gladep
index 9f6e094..1e3ff94 100644 (file)
--- a/src/ui-gnome.gladep
+++ b/src/ui-gnome.gladep
@@ -3,7 +3,7 @@
 
 <glade-project>
   <name>ui-gnome</name>
 
 <glade-project>
   <name>ui-gnome</name>

-  <program_name>udpforward</program_name>
+  <program_name>udpgate</program_name>

   <source_directory>.</source_directory>
   <use_widget_names>TRUE</use_widget_names>
   <output_main_file>FALSE</output_main_file>
   <source_directory>.</source_directory>
   <use_widget_names>TRUE</use_widget_names>
   <output_main_file>FALSE</output_main_file>

diff --git a/src/ui-gnome.h b/src/ui-gnome.h
index bc40bd5..3eaba34 100644 (file)
--- a/src/ui-gnome.h
+++ b/src/ui-gnome.h
@@ -1,6 +1,6 @@
 /* $Id$
  * Include file for Gnome user interface
 /* $Id$
  * Include file for Gnome user interface

- * Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+ * Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -17,8 +17,8 @@
  */
 
 
  */
 
 

-#ifndef _UDPFORWARD_UI_GNOME_H
-#define _UDPFORWARD_UI_GNOME_H 1
+#ifndef _UDPGATE_UI_GNOME_H
+#define _UDPGATE_UI_GNOME_H 1

 
 
 #include <glib/gtypes.h>
 
 
 #include <glib/gtypes.h>


@@ -32,4 +32,4 @@ void ui_gnome_interactive(void);
 G_END_DECLS
 
 
 G_END_DECLS
 
 

-#endif /* _UDPFORWARD_UI_GNOME_H */
+#endif /* _UDPGATE_UI_GNOME_H */

diff --git a/udpforward.spec.in b/udpgate.spec.in
similarity index 88%
rename from udpforward.spec.in
rename to udpgate.spec.in
index b4bfa2b..aa30ca4 100644 (file)
--- a/udpforward.spec.in
+++ b/udpgate.spec.in
@@ -1,6 +1,6 @@
 # $Id$
 # rpm package description file for building
 # $Id$
 # rpm package description file for building

-# Copyright (C) 2004 Jan Kratochvil <project-udpforward@jankratochvil.net>
+# Copyright (C) 2004 Jan Kratochvil <project-udpgate@jankratochvil.net>

 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -19,14 +19,14 @@
 # Temporary cludge before full 'devel' package gets deployed
 %define _unpackaged_files_terminate_build 0
 
 # Temporary cludge before full 'devel' package gets deployed
 %define _unpackaged_files_terminate_build 0
 

-Summary: UDP packets forwarding utility
+Summary: UDP packets gatewaying utility

 Name: @PACKAGE@
 %define release 0
 Version: @VERSION@
 Release: %{release}
 Group: Applications/Communications
 Name: @PACKAGE@
 %define release 0
 Version: @VERSION@
 Release: %{release}
 Group: Applications/Communications

-Packager: Jan Kratochvil <project-udpforward@jankratochvil.net>
-Source: http://www.jankratochvil.net/project/udpforward/dist/@PACKAGE@-@VERSION@.tar.gz
+Packager: Jan Kratochvil <project-udpgate@jankratochvil.net>
+Source: http://www.jankratochvil.net/project/udpgate/dist/@PACKAGE@-@VERSION@.tar.gz

 Copyright: GPL
 BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-%{release}-root
 BuildRequires: popt
 Copyright: GPL
 BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-%{release}-root
 BuildRequires: popt