From: Christian Hofstaedtler Date: Thu, 30 Jan 2014 18:56:56 +0000 (+0100) Subject: Rename (json_)ws.(cc|hh) to ws-(auth|recursor).(cc|hh) X-Git-Tag: rec-3.6.0-rc1~211^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2470b36e08374e73e0f60ac72cbc5a8ec8a8a8bd;p=thirdparty%2Fpdns.git Rename (json_)ws.(cc|hh) to ws-(auth|recursor).(cc|hh) Because that's really what those files are: the implementation of the webserver in the Auth or Recursor server, respectively. --- diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor index 9ceadfbe85..171e21cc55 100644 --- a/pdns/Makefile-recursor +++ b/pdns/Makefile-recursor @@ -21,7 +21,7 @@ dnswriter.o dnsrecords.o rcpgenerator.o base64.o zoneparser-tng.o \ rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \ dns_random.o ext/polarssl-1.3.2/library/aes.o ext/polarssl-1.3.2/library/padlock.o dnslabeltext.o \ lua-pdns.o lua-recursor.o randomhelper.o recpacketcache.o dns.o \ -reczones.o base32.o nsecrecords.o json.o json_ws.o version.o responsestats.o \ +reczones.o base32.o nsecrecords.o json.o ws-recursor.o version.o responsestats.o \ session.o webserver.o ext/yahttp/yahttp/reqresp.o REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o misc.o \ diff --git a/pdns/Makefile.am b/pdns/Makefile.am index b2d5b206c3..bea08dd6c2 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -44,7 +44,7 @@ qtype.cc logger.cc arguments.cc packethandler.cc tcpreceiver.cc \ packetcache.cc statbag.cc pdnsexception.hh arguments.hh distributor.hh \ dns.hh dnsbackend.hh dnsbackend.cc dnspacket.hh dynmessenger.hh lock.hh logger.hh \ nameserver.hh packetcache.hh packethandler.hh qtype.hh statbag.hh \ -ueberbackend.hh pdns.conf-dist ws.hh ws.cc webserver.cc webserver.hh \ +ueberbackend.hh pdns.conf-dist ws-auth.hh ws-auth.cc webserver.cc webserver.hh \ session.cc session.hh misc.cc misc.hh receiver.cc ueberbackend.cc \ dynlistener.cc dynlistener.hh dynhandler.cc dynhandler.hh \ resolver.hh resolver.cc slavecommunicator.cc mastercommunicator.cc communicator.cc communicator.hh dnsproxy.cc \ @@ -283,7 +283,7 @@ base64.cc base64.hh zoneparser-tng.cc zoneparser-tng.hh rec_channel.cc rec_chann rec_channel_rec.cc selectmplexer.cc epollmplexer.cc sillyrecords.cc htimer.cc htimer.hh \ dns_random.cc \ lua-pdns.cc lua-pdns.hh lua-recursor.cc lua-recursor.hh randomhelper.cc \ -recpacketcache.cc recpacketcache.hh dns.cc nsecrecords.cc base32.cc cachecleaner.hh json_ws.cc json_ws.hh \ +recpacketcache.cc recpacketcache.hh dns.cc nsecrecords.cc base32.cc cachecleaner.hh ws-recursor.cc ws-recursor.hh \ json.cc json.hh version.hh version.cc responsestats.cc webserver.cc webserver.hh session.cc session.hh pdns_recursor_LDFLAGS= $(LUA_LIBS) diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc index bfdb3cce43..0b21ff6f4e 100644 --- a/pdns/common_startup.cc +++ b/pdns/common_startup.cc @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "common_startup.hh" -#include "ws.hh" +#include "ws-auth.hh" bool g_anyToTcp; bool g_addSuperfluousNSEC3; diff --git a/pdns/dist-recursor b/pdns/dist-recursor index f7a29c9ae2..2342120062 100755 --- a/pdns/dist-recursor +++ b/pdns/dist-recursor @@ -35,7 +35,7 @@ base64.cc zoneparser-tng.cc rec_channel.cc rec_channel_rec.cc rec_control.cc \ selectmplexer.cc epollmplexer.cc kqueuemplexer.cc portsmplexer.cc pdns_hw.cc \ sillyrecords.cc lua-pdns.cc lua-recursor.cc randomhelper.cc \ devpollmplexer.cc recpacketcache.cc dns.cc reczones.cc base32.cc nsecrecords.cc \ -dnslabeltext.cc json.cc json_ws.cc json_ws.hh version.cc dns_random.cc \ +dnslabeltext.cc json.cc ws-recursor.cc ws-recursor.hh version.cc dns_random.cc \ responsestats.cc webserver.cc session.cc" cd docs diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 256f5492da..0d8f9b8a53 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -24,7 +24,7 @@ #include #include #include -#include "json_ws.hh" +#include "ws-recursor.hh" #include #include "recpacketcache.hh" #include "utility.hh" diff --git a/pdns/receiver.cc b/pdns/receiver.cc index 421c1127a0..355dd05b9d 100644 --- a/pdns/receiver.cc +++ b/pdns/receiver.cc @@ -56,7 +56,6 @@ #include "packethandler.hh" #include "statbag.hh" #include "tcpreceiver.hh" -#include "ws.hh" #include "misc.hh" #include "dynlistener.hh" #include "dynhandler.hh" diff --git a/pdns/ws.cc b/pdns/ws-auth.cc similarity index 99% rename from pdns/ws.cc rename to pdns/ws-auth.cc index 2d2d1958f6..85bb81726a 100644 --- a/pdns/ws.cc +++ b/pdns/ws-auth.cc @@ -20,7 +20,7 @@ */ #include "utility.hh" #include "dynlistener.hh" -#include "ws.hh" +#include "ws-auth.hh" #include "json.hh" #include "webserver.hh" #include "logger.hh" diff --git a/pdns/ws.hh b/pdns/ws-auth.hh similarity index 100% rename from pdns/ws.hh rename to pdns/ws-auth.hh diff --git a/pdns/json_ws.cc b/pdns/ws-recursor.cc similarity index 99% rename from pdns/json_ws.cc rename to pdns/ws-recursor.cc index 6204e53295..3b19327fa6 100644 --- a/pdns/json_ws.cc +++ b/pdns/ws-recursor.cc @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "json_ws.hh" +#include "ws-recursor.hh" #include "json.hh" #include #include diff --git a/pdns/json_ws.hh b/pdns/ws-recursor.hh similarity index 100% rename from pdns/json_ws.hh rename to pdns/ws-recursor.hh