From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 14 Jul 2011 09:09:25 +0000 (+0300)
Subject: Bug 3274: assertion failed: CommCalls.h:144: "dp"
X-Git-Tag: take08~55^2~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2832d7c0d19030714115a9db3e0a33b728e948f0;p=thirdparty%2Fsquid.git

Bug 3274: assertion failed: CommCalls.h:144: "dp"

The  ConnOpener::earlyAbort method shopuld defined as comm close handler
which means that it should have as argument CommCloseCbParams not
CommConnectCbParams
---

diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index e5417ce093..84f30c3b2a 100644
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -156,7 +156,7 @@ Comm::ConnOpener::start()
         }
     }
 
-    typedef CommCbMemFunT<Comm::ConnOpener, CommConnectCbParams> abortDialer;
+    typedef CommCbMemFunT<Comm::ConnOpener, CommCloseCbParams> abortDialer;
     calls_.earlyAbort_ = JobCallback(5, 4, abortDialer, this, Comm::ConnOpener::earlyAbort);
     comm_add_close_handler(conn_->fd, calls_.earlyAbort_);
 
@@ -279,7 +279,7 @@ Comm::ConnOpener::lookupLocalAddress()
  * Handles the case(s) when a partially setup connection gets closed early.
  */
 void
-Comm::ConnOpener::earlyAbort(const CommConnectCbParams &io)
+Comm::ConnOpener::earlyAbort(const CommCloseCbParams &io)
 {
     debugs(5, 3, HERE << io.conn);
     doneConnecting(COMM_ERR_CLOSING, io.xerrno); // NP: is closing or shutdown better?
diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h
index 06ace783dc..0874605b5b 100644
--- a/src/comm/ConnOpener.h
+++ b/src/comm/ConnOpener.h
@@ -34,7 +34,7 @@ private:
     ConnOpener(const ConnOpener &);
     ConnOpener & operator =(const ConnOpener &c);
 
-    void earlyAbort(const CommConnectCbParams &);
+    void earlyAbort(const CommCloseCbParams &);
     void timeout(const CommTimeoutCbParams &);
     void doneConnecting(comm_err_t status, int xerrno);
     static void InProgressConnectRetry(int fd, void *data);