Merge lp:~gary-wzl77/squid/ipc_prefix into lp:squid/3.5

[Gary.Wang]

Added new configure option --with-ipcprefix to enable to customize
share memory object namespace prefix in compile time.
This's the minimal change to squid to make it work in strict confinement of snap world.

Added new configure option --with-ipcprefix to enable to customize
share memory object namespace prefix in compile time.
This's the minimal change to squid to make it work in strict confinement of snap world.

[Amos Jeffries (yadi)]

As mentioned earlier, merge requests should be sent to squid-dev mailing list. We need to discuss why the configurable service_name is not being used for this. Particularly since this patch is altering the behaviour of that feature.

review: Needs Information

[Alex Rousskov (rousskov)]

Please explain why the existing DEFAULT_STATEDIR cannot be used to customize the
shared memory segment prefix at compile time.

I agree with Amos that it is best to discuss this on squid-dev.

review: Needs Information

[lp:~gary-wzl77/squid/ipc_prefix]

14150. By Gary.Wang on 2017-03-17

To keep it consistent, change src/ipc/Port.cc to honor the new DEFAULT_IPC_PREFIX.

Unmerged revisions

14150. By Gary.Wang on 2017-03-17

To keep it consistent, change src/ipc/Port.cc to honor the new DEFAULT_IPC_PREFIX.

14149. By Gary.Wang on 2017-03-02

Added new configure option --with-ipcprefix to enable to customize
share memory object namespace prefix in compile time.
This's the minimal change to squid to make it work in strict confinement of snap world.

=== modified file 'configure.ac'
--- configure.ac	2017-01-28 03:54:15 +0000
+++ configure.ac	2017-03-17 08:02:27 +0000
@@ -311,6 +311,15 @@
 ])
 AC_SUBST(DEFAULT_SWAP_DIR)
 
+DEFAULT_IPC_PREFIX=""
+AC_ARG_WITH(ipcprefix,
+  AS_HELP_STRING([--with-ipcprefix=NAME],
+    [Default namespace prefix for shared memory object for ipc communication. 
+     Default is empty string and the share memory object name will be specified by squid. ]), [
+   DEFAULT_IPC_PREFIX="$withval"
+])
+AC_SUBST(DEFAULT_IPC_PREFIX)
+
 if test "$squid_cv_compiler" = "gcc"; then
   GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
   GCCVER2=`echo $GCCVER | awk '{print $1 * 100}'`
 
=== modified file 'src/ipc/Makefile.am'
--- src/ipc/Makefile.am	2017-01-01 00:16:45 +0000
+++ src/ipc/Makefile.am	2017-03-17 08:02:27 +0000
@@ -68,7 +68,7 @@
 	mem/Segment.cc \
 	mem/Segment.h
 
-DEFS += -DDEFAULT_STATEDIR=\"$(localstatedir)/run/squid\"
+DEFS += -DDEFAULT_STATEDIR=\"$(localstatedir)/run/squid\" -DDEFAULT_IPC_PREFIX=\"$(DEFAULT_IPC_PREFIX)\"
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/squid;
 
=== modified file 'src/ipc/Port.cc'
--- src/ipc/Port.cc	2017-01-01 00:16:45 +0000
+++ src/ipc/Port.cc	2017-03-17 08:02:27 +0000
@@ -51,6 +51,7 @@
 {
     assert(id >= 0);
     String addr = channelPathPfx;
+    addr.append(DEFAULT_IPC_PREFIX);
     addr.append(service_name.c_str());
     addr.append(processLabel);
     addr.append('-');
@@ -65,6 +66,7 @@
     static String coordinatorAddr;
     if (!coordinatorAddr.size()) {
         coordinatorAddr= channelPathPfx;
+        coordinatorAddr.append(DEFAULT_IPC_PREFIX);
         coordinatorAddr.append(service_name.c_str());
         coordinatorAddr.append(coordinatorAddrLabel);
         coordinatorAddr.append(".ipc");
 
=== modified file 'src/ipc/mem/Segment.cc'
--- src/ipc/mem/Segment.cc	2017-01-01 00:16:45 +0000
+++ src/ipc/mem/Segment.cc	2017-03-17 08:02:27 +0000
@@ -30,6 +30,8 @@
 #include <unistd.h>
 #endif
 
+#define DEFAULT_SQUID_IPC_PREFIX  "/" DEFAULT_IPC_PREFIX
+
 // test cases change this
 const char *Ipc::Mem::Segment::BasePath = DEFAULT_STATEDIR;
 
@@ -229,9 +231,9 @@
     if (nameIsPath) {
         name.append(BasePath);
         if (name[name.size()-1] != '/')
-            name.append('/');
+            name.append(DEFAULT_SQUID_IPC_PREFIX);
     } else {
-        name.append('/');
+        name.append(DEFAULT_SQUID_IPC_PREFIX);
         name.append(service_name.c_str());
         name.append('-');
     }