Changeset 677

Timestamp:

06/18/07 00:02:46 (14 months ago)

Author:

daelstorm

Message:

always get ip from server when interface requests it

Location:

museek+/trunk/sources

Files:

• museekd.rc (modified) (2 diffs)
• museekd/museekd.cc (modified) (1 diff)

museek+/trunk/sources/museekd.rc

@@ -6 +6 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
+# Change to the user you wish to run museekd
+USER=root
 
 MUSEEKD=/usr/bin/museekd
 MUSETUP=/usr/bin/musetup
 MUSCAN=/usr/bin/muscan
-MUSOCKET=/tmp/museekd.root
+MUSOCKET=/tmp/museekd.$USER
 PIDFILE=/var/run/museekd.pid
 DBDIR=/var/museek
 CONFIG=$DBDIR/museekd.xml
 CHOWNSOCKET=YES
+
 
 case "$1" in
@@ -29 +32 @@
         fi
         stat_busy "Starting Museek Daemon"
-        $MUSEEKD -c $CONFIG &>/dev/null &
+        $MUSEEKD -c $CONFIG &>/dev/null -- $USER &
         PID="$!"
         sleep 2

museek+/trunk/sources/museekd/museekd.cc

@@ -584 +584 @@
 void Museekd::cb_iface_peer_address(IfaceConnection* conn, const string& user) {
         Peer* peer = mPeerManager->get_peer(user);
-        if(peer->have_address()) {
-                conn->peer_address(user, peer->ip(), peer->port());
-        } else {
-                server_get_peer_address(user);
+//      if(peer->have_address()) {
+//              conn->peer_address(user, peer->ip(), peer->port());
+//      } else {
+        server_get_peer_address(user);
         }
 }