Changeset 24106 for main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp

Timestamp:

2011-05-31T23:08:12+12:00 (13 years ago)

Author:

davidb

Message:

Two new macros set, _remoteAddr_ and _remoteHost_ (if reverse lookup is know). These macros reflect the comparable environment variables that a CGI environment set

File:

• main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp

@@ -1449 +1449 @@
   disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
 
+  // This perhaps should be done with gsdl_getenv() which takes the
+  // 'fcgienv' parameter (for fast-cgi), however if changed to this, this
+  // additional parameter would need to be passed into here (not sure how
+  // that would effect any virtual inheritence going on), or else moved
+  // higher up the calling to chain to, e.g., produce_cgi_page()
+
+  char* remote_addr = getenv("REMOTE_ADDR");
+
+  if (remote_addr != NULL) {
+     text_t remote_addr_t(remote_addr);
+     disp.setmacro ("remoteAddr", displayclass::defaultpackage, remote_addr_t);
+  }
+
+  char* remote_host = getenv("REMOTE_HOST");
+  if (remote_host != NULL) {
+     text_t remote_host_t(remote_host);
+     disp.setmacro ("remoteHost", displayclass::defaultpackage, remote_host_t);
+  }
+  else {
+     // setting this to "unknown" is easier to deal with in format/macro
+     // statements, rather than testing for _remoteHost_
+     disp.setmacro ("remoteHost", displayclass::defaultpackage, "unknown");
+  }
+
+
   text_t compressedoptions = get_compressed_arg(args, logout);
   disp.setmacro ("compressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));