Simplify the libraries being used.

[invirt/packages/python-afs.git] / afs / _pts.pyx

diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index a06911d..8a5751c 100644 (file)
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -1,16 +1,18 @@
-cimport afs as a
+from afs cimport *

 
 cdef class PTS:
 
 cdef class PTS:

-    cdef a.ubik_client * client
+    cdef ubik_client * client

     
     def __cinit__(self, cell=None, sec=1):
     
     def __cinit__(self, cell=None, sec=1):

-        cdef a.afs_int32 code
-        cdef a.afsconf_dir *cdir
-        cdef a.afsconf_cell info
+        cdef afs_int32 code
+        cdef afsconf_dir *cdir
+        cdef afsconf_cell info

         cdef char * c_cell
         cdef char * c_cell

-        cdef a.ktc_principal prin
-        cdef a.ktc_token token
-        cdef a.rx_securityClass *sc
+        cdef ktc_principal prin
+        cdef ktc_token token
+        cdef rx_securityClass *sc
+        cdef rx_connection *serverconns[MAXSERVERS]
+        cdef int i

         
         if cell is None:
             c_cell = NULL
         
         if cell is None:
             c_cell = NULL

@@ -19,45 +21,58 @@ cdef class PTS:
         
         self.client = NULL
         
         
         self.client = NULL
         

-        code = a.rx_Init(0)
+        code = rx_Init(0)

         if code != 0:
             raise Exception(code, "Error initializing Rx")
         
         if code != 0:
             raise Exception(code, "Error initializing Rx")
         

-        cdir = a.afsconf_Open(a.AFSDIR_CLIENT_ETC_DIRPATH)
+        cdir = afsconf_Open(AFSDIR_CLIENT_ETC_DIRPATH)

         if cdir is NULL:
         if cdir is NULL:

-            raise OSError(a.errno,
+            raise OSError(errno,

                           "Error opening configuration directory (%s): %s" % \
                           "Error opening configuration directory (%s): %s" % \

-                              (a.AFSDIR_CLIENT_ETC_DIRPATH, a.strerror(a.errno)))
-        code = a.afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info)
+                              (AFSDIR_CLIENT_ETC_DIRPATH, strerror(errno)))
+        code = afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info)

         if code != 0:
         if code != 0:

-            raise Exception(code, "GetCellInfo: %s" % a.error_message(code))
+            raise Exception(code, "GetCellInfo: %s" % afs_error_message(code))

         
         if sec > 0:
         
         if sec > 0:

-            a.strncpy(prin.cell, info.name, sizeof(prin.cell))
+            strncpy(prin.cell, info.name, sizeof(prin.cell))

             prin.instance[0] = 0
             prin.instance[0] = 0

-            a.strncpy(prin.name, "afs", sizeof(prin.name))
+            strncpy(prin.name, "afs", sizeof(prin.name))

             
             

-            code = a.ktc_GetToken(&prin, &token, sizeof(token), NULL);
+            code = ktc_GetToken(&prin, &token, sizeof(token), NULL);

             if code != 0:
                 if sec >= 2:
                     # No really - we wanted authentication
             if code != 0:
                 if sec >= 2:
                     # No really - we wanted authentication

-                    raise Exception(code, "Failed to get token for service AFS: %s" % a.error_message(code))
+                    raise Exception(code, "Failed to get token for service AFS: %s" % afs_error_message(code))

                 sec = 0
             else:
                 if sec == 3:
                 sec = 0
             else:
                 if sec == 3:

-                    level = a.rxkad_crypt
+                    level = rxkad_crypt

                 else:
                 else:

-                    level = a.rxkad_clear
-                sc = a.rxkad_NewClientSecurityObject(level, &token.sessionKey,
+                    level = rxkad_clear
+                sc = rxkad_NewClientSecurityObject(level, &token.sessionKey,

                                                    token.kvno, token.ticketLen,
                                                    token.ticket)
         
         if sec == 0:
                                                    token.kvno, token.ticketLen,
                                                    token.ticket)
         
         if sec == 0:

-            sc = a.rxnull_NewClientSecurityObject()
+            sc = rxnull_NewClientSecurityObject()

         else:
             sec = 2
         
         else:
             sec = 2
         

-        code = a.rxs_Release(sc)
+        memset(serverconns, 0, sizeof(serverconns))
+        for 0 <= i < info.numServers:
+            serverconns[i] = rx_NewConnection(info.hostAddr[i].sin_addr.s_addr,
+                                              info.hostAddr[i].sin_port,
+                                              PRSRV,
+                                              sc,
+                                              sec)
+        
+        code = ubik_ClientInit(serverconns, &self.client)
+        if code != 0:
+            raise Exception("Failed to initialize ubik connection to Protection server: %s" % afs_error_message(code))
+        
+        code = rxs_Release(sc)

     
     def __dealloc__(self):
     
     def __dealloc__(self):

-        a.rx_Finalize()
+        ubik_ClientDestroy(self.client)
+        rx_Finalize()