- moved the codemux directory to /usr/sbin/

- bump the version

diff --git a/Makefile b/Makefile
index 20ca160..83cb0f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,4 +17,4 @@ codemux: ${CODEMUX_OBJ}
 install:
        install -D -m 0755 -o root -g root codemux.initscript $(INSTALL_ROOT)/etc/rc.d/init.d/codemux
        install -D -m 0644 -o root -g root codemux.conf $(INSTALL_ROOT)/etc/codemux/codemux.conf
-       install -D -m 0755 -o root -g root codemux $(INSTALL_ROOT)/usr/local/planetlab/sbin/codemux
+       install -D -m 0755 -o root -g root codemux $(INSTALL_ROOT)/usr/sbin/codemux

diff --git a/codemux.initscript b/codemux.initscript
index 2780e67..2ab4841 100644 (file)
--- a/codemux.initscript
+++ b/codemux.initscript
@@ -34,7 +34,7 @@ case "$1" in
             rm -f $pidfile
         fi
 
-        initlog -c /usr/local/planetlab/sbin/codemux
+        initlog -c /usr/sbin/codemux
 
         cmd=success
         check_status && touch /var/lock/subsys/$PROC || cmd=failure

diff --git a/codemux.spec b/codemux.spec
index dcdfd9e..127e522 100644 (file)
--- a/codemux.spec
+++ b/codemux.spec
@@ -1,6 +1,6 @@
 %define name codemux 
 %define version 0.1
-%define release 4%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 5%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Summary: CoDemux - HTTP port DeMux
 Name: %{name} 
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root)
 %attr(0755,root,root) %{_initrddir}/codemux
 %config /etc/codemux/codemux.conf
-%attr(0755,root,root) /usr/local/planetlab/sbin/codemux
+%attr(0755,root,root) /usr/sbin/codemux
 
 %post
 chkconfig codemux reset

diff --git a/codns.h b/codns.h
deleted file mode 100644 (file)
index 2f7f36e..0000000
--- a/codns.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _CODNS_H_
-#define _CODNS_H_
-#include "ports.h"
-
-/* query info - fixed part */
-typedef struct LocalQueryInfo {
-  int lqi_size;                 /* length of the name string */
-  int lqi_id;                   /* query id */
-  int lqi_cache;                /* not being used now */
-} LocalQueryInfo;
-
-/* query info + name 
-   query structure expected from a client */
-#define MAX_QUERY_NAME 256
-#define SIG_SPLIT_TRANSACTION 0 /* signature for split-transaction */
-typedef struct LocalQuery {
-  int  lq_zero;                 /* always set to SIG_SPLIT_TRANSACTION(=0) */
-  LocalQueryInfo lq_info;       /* query info */
-  char lq_name[MAX_QUERY_NAME]; /* name */
-} LocalQuery;
-
-/* query result from CoDNS 
-   we set MAX_ANSWERS for easy implementation.
-   if lq.address[i].s_addr == 0, that means it returned i-1 valid anwers. */
-#define MAX_ANSWERS 8         
-typedef struct LocalQueryResult {
-  int lq_id;                               /* query id */
-  int lq_ttl;                              /* TTL of the record */
-  struct in_addr lq_address[MAX_ANSWERS];  /* IP addresses for the query */
-} LocalQueryResult;
-
-/*----------------------------------------------------------------------*/
-
-/* temporary section : from here to the end
-   used for defining variables or constants for testing */
-
-/* for testing in HBTWGET */
-#define HBTWGET_CODNS_ID (-3)
-
-#endif // _CODNS_H_
-
-