X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/blobdiff_plain/2d2104b92ce4f472ade76c8fbb737b1c9028f8ea..de7387fa5a6a9023ce16c679ccb08b6496afc9b7:/afs/_pts.pyx

diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index 49ee9b6..822caf5 100644
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -1,24 +1,33 @@
-cdef extern from "afs/stds.h":
-    ctypedef long afs_int32
-
-cdef extern from "ubik.h":
-    enum:
-        MAXSERVERS
-    
-    struct ubik_client:
-        pass
-
-cdef extern from "rx/rx.h":
-    int rx_Init(int port)
+cimport afs as a
 
 cdef class PTS:
-    cdef ubik_client * client
+    cdef a.ubik_client * client
     
-    def __cinit__(self):
-        cdef afs_int32 code
+    def __cinit__(self, cell=None, sec=1):
+        cdef a.afs_int32 code
+        cdef a.afsconf_dir *cdir
+        cdef a.afsconf_cell info
+        cdef char * c_cell
+        
+        if cell is None:
+            c_cell = NULL
+        else:
+            c_cell = cell
         
         self.client = NULL
         
-        code = rx_Init(0)
+        code = a.rx_Init(0)
         if code != 0:
-            raise Exception(str(code))
+            raise Exception(code, "Error initializing Rx")
+        
+        cdir = a.afsconf_Open(a.AFSDIR_CLIENT_ETC_DIRPATH)
+        if cdir is NULL:
+            raise OSError(a.errno,
+                          "Error opening configuration directory (%s): %s" % \
+                              (a.AFSDIR_CLIENT_ETC_DIRPATH, a.strerror(a.errno)))
+        code = a.afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info)
+        if code != 0:
+            raise Exception(code, "GetCellInfo: %s" % a.error_message(code))
+    
+    def __dealloc__(self):
+        a.rx_Finalize()