[svn] commit: r1550 - in /trunk/src/lib: cc/session.cc python/isc/cc/session.py

[BIND 10 source code commits]

Author: mgraff
Date: Thu Mar 18 22:32:13 2010
New Revision: 1550

Log:
possible fix for trak#111

Modified:
    trunk/src/lib/cc/session.cc
    trunk/src/lib/python/isc/cc/session.py

Modified: trunk/src/lib/cc/session.cc
==============================================================================
--- trunk/src/lib/cc/session.cc (original)
+++ trunk/src/lib/cc/session.cc Thu Mar 18 22:32:13 2010
@@ -220,9 +220,14 @@
     if (s < 0) {
         isc_throw(SessionError, "socket() failed");
     }
+    
+    int port = atoi(getenv("ISC_MSGQ_PORT"));
+    if (port == 0) {
+        port = 9912;
+    }
 
     sin.sin_family = AF_INET;
-    sin.sin_port = htons(9912);
+    sin.sin_port = htons(port);
     sin.sin_addr.s_addr = INADDR_ANY;
 
 #ifdef HAVE_SIN_LEN

Modified: trunk/src/lib/python/isc/cc/session.py
==============================================================================
--- trunk/src/lib/python/isc/cc/session.py (original)
+++ trunk/src/lib/python/isc/cc/session.py Thu Mar 18 22:32:13 2010
@@ -16,8 +16,8 @@
 import sys
 import socket
 import struct
-
-#from isc.cc import message
+import os
+
 import isc.cc.message
 
 class ProtocolError(Exception): pass
@@ -25,7 +25,7 @@
 class SessionError(Exception): pass
 
 class Session:
-    def __init__(self, port=9912):
+    def __init__(self, port=0):
         self._socket = None
         self._lname = None
         self._recvbuffer = bytearray()
@@ -33,6 +33,11 @@
         self._sequence = 1
         self._closed = False
         self._queue = []
+
+        if port == 0 and 'B10_FROM_SOURCE' in os.environ:
+	  port = int(os.environ["ISC_MSGQ_PORT"])
+	else:
+	  port = 9912
 
         try:
             self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)