From 7c2fcae4d3c6336dbcecef31cc0e2d9ef4046e97 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Mon, 16 Mar 2009 09:51:14 +0100 Subject: [PATCH] _host_IP und alias ggred --- CHANGESTODO | 13 ++++++++++++- bin/psyconf | 2 +- config/versioncontrol.tcsh | 7 +++++++ install.sh | 2 +- place/ircgate.c | 7 ++++--- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/CHANGESTODO b/CHANGESTODO index bcf1d43..b58d1d5 100644 --- a/CHANGESTODO +++ b/CHANGESTODO @@ -8,11 +8,16 @@ ________________________________________________________________________ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ? support tls multiplexing on all suitable ports +? bugs in psyced install procedure + - pointless to keep gentoo files in this git, if they can't be updated separately ________________________________________________________________________ == currently being inspected =========================================== ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ +- jabber logout isn't announced or offline avail isn't processed + ... apparently other side did not logout properly, as it doesn't happen always + - neither USE_THE_NICK or USE_AUTOALIAS work flawlessly. in the case of the latter, _nick either displays without uniform for remote people, or it occasionally shows a room's nick instead of the user's nick. @@ -22,6 +27,11 @@ ________________________________________________________________________ templates and removing _nick vars. during this tradition we keep the USE_THE_NICK code running. several "invite issues" should be solved once nicks are gone. + +- psyced.org tells me: Ungültige Route nach psyc://psyced.org + im psyc://psyced.org/~lynx Context festgestellt. + +? who's gonna clean up the mess of having too many websites ? ________________________________________________________________________ == psyced 1.0 ========================================================== ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ @@ -3870,4 +3880,5 @@ psyctext entity nicknames (experimental). allows to remove nicks from protocol. spyc/* psyc/* + should a _date type run on unixtime minus PSYC_EPOCH? - +install.sh ++ don't leave _host_IP uncommented diff --git a/bin/psyconf b/bin/psyconf index 3625e4b..7b4d5ab 100755 --- a/bin/psyconf +++ b/bin/psyconf @@ -361,7 +361,7 @@ X my $hc = 0; ## ldmud bug number one: you have to provide hostname AFTER hostaddr - if ($c{_basic_host_IP}) { + if ($c{_basic_host_IP} =~ /^[0-9\.]+$/) { $psyced .= " --hostaddr $c{_basic_host_IP}"; $hc = 1; # problem? } diff --git a/config/versioncontrol.tcsh b/config/versioncontrol.tcsh index e16e5ea..4304350 100644 --- a/config/versioncontrol.tcsh +++ b/config/versioncontrol.tcsh @@ -36,3 +36,10 @@ alias ctoc '(cd $CVSHOME;cvs diff -bur HEAD CHANGESTODO|& difvu -' alias ctodo '(cd $PSYCEDHOME;cvs update CHANGESTODO;$EDITOR CHANGESTODO;cvs ci -m + CHANGESTODO)' alias todo '(cd $PSYCEDHOME;$EDITOR CHANGESTODO)' +# edit all files that contain a certain keyword +# uses the +/searchstring syntax supported by vi and other smart editors +alias gred '$EDITOR "+/\!*" `grep -swIrl \!* .`' +# grep -r is a bit stupid: it follows symlinks, then shows us files twice +# so using the git full text index may be smarter and faster +alias ggred '$EDITOR "+/\!*" `git grep -w -l \!*`' + diff --git a/install.sh b/install.sh index fdc9378..4187754 100755 --- a/install.sh +++ b/install.sh @@ -974,7 +974,7 @@ _host_domain = $DOMAIN_NAME ; Would you like to bind the server to a specific IP address? ; If you do you MUST also provide _host_name and _host_domain -;_host_IP = $HOST_IP +_host_IP = $HOST_IP ; Nickname for the chatserver. Appears in login message, telnet prompt, ; IRC gateways and some web pages. Will use _host_name if unspecified. diff --git a/place/ircgate.c b/place/ircgate.c index bc64167..c06e1ec 100644 --- a/place/ircgate.c +++ b/place/ircgate.c @@ -6,7 +6,8 @@ // // to make this work you need to add the following to local.h: // -// #define RELAY "ircgate" +// #define RELAY "ircgate" // name of ircnet (?) +// #define RELAY_OBJECT "place/ircgate" // this class // // do not use in existing psyced communities in the current set up // as currently all incoming traffic is presumed to be meant for the @@ -39,13 +40,13 @@ #define IRCGATE_LOCAL "pw" #define NAME "IRCgate" -#define ON_CONNECT login(); +#define ON_CONNECT onConnect(); #define CONNECT_IRC "localhost", 7000 #define EMULATE_SERVER // don't be a bot #include -login() { +onConnect() { PT(("ircgate serving into "+query_ip_number()+"\n")) // login procedure may vary with different flavors of ircd, // that's why we keep it entirely here