X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/blobdiff_plain/ceab28a3b461ae9e5e54be3628aeb32115171831..51b6154866aaf16653af673b9a3dedd5c244eb28:/afs/afs.pxd?ds=sidebyside

diff --git a/afs/afs.pxd b/afs/afs.pxd
index 06cf0d7..fab7019 100644
--- a/afs/afs.pxd
+++ b/afs/afs.pxd
@@ -9,6 +9,10 @@ cdef extern from "string.h":
     char * strncpy(char *s1, char *s2, size_t n)
     void * memset(void *b, int c, size_t n)
 
+cdef extern from "stdlib.h":
+     void * malloc(int size)
+     void free(void *)
+
 cdef extern from "netinet/in.h":
     struct in_addr:
         int s_addr
@@ -30,12 +34,12 @@ cdef extern from "afs/cellconfig.h":
         MAXCELLCHARS
         MAXHOSTSPERCELL
         MAXHOSTCHARS
-    
+
     # We just pass afsconf_dir structs around to other AFS functions,
     # so this can be treated as opaque
     struct afsconf_dir:
         pass
-    
+
     # For afsconf_cell, on the other hand, we care about everything
     struct afsconf_cell:
         char name[MAXCELLCHARS]
@@ -45,32 +49,24 @@ cdef extern from "afs/cellconfig.h":
         char hostName[MAXHOSTSPERCELL][MAXHOSTCHARS]
         char *linkedCell
         int timeout
-     
+
     afsconf_dir *afsconf_Open(char *adir)
     int afsconf_GetCellInfo(afsconf_dir *adir,
                             char *acellName,
                             char *aservice,
                             afsconf_cell *acellInfo)
 
-cdef extern from "ubik.h":
-    enum:
-        MAXSERVERS
-    
-    # ubik_client is an opaque struct, so we don't care about its members
-    struct ubik_client:
-        pass
-
 cdef extern from "rx/rxkad.h":
     ctypedef char rxkad_level
-    
+
     enum:
         MAXKTCNAMELEN
         MAXKTCREALMLEN
-    
+
     enum:
         rxkad_clear
         rxkad_crypt
-    
+
     struct ktc_encryptionKey:
         pass
 
@@ -78,26 +74,26 @@ cdef extern from "rx/rxkad.h":
         char name[MAXKTCNAMELEN]
         char instance[MAXKTCNAMELEN]
         char cell[MAXKTCREALMLEN]
-    
+
     struct rx_securityClass:
         pass
-    
+
     rx_securityClass *rxkad_NewClientSecurityObject(rxkad_level level,
                                                     ktc_encryptionKey *sessionKey,
                                                     afs_int32 kvno,
                                                     int ticketLen,
                                                     char *ticket)
     rx_securityClass *rxnull_NewClientSecurityObject()
-    
+
     int rxs_Release(rx_securityClass *aobj)
 
 cdef extern from "rx/rx.h":
     int rx_Init(int port)
     void rx_Finalize()
-    
+
     struct rx_connection:
         pass
-    
+
     rx_connection *rx_NewConnection(afs_uint32 shost,
                                     unsigned short sport,
                                     unsigned short sservice,
@@ -107,13 +103,13 @@ cdef extern from "rx/rx.h":
 cdef extern from "afs/auth.h":
     enum:
         MAXKTCTICKETLEN
-    
+
     struct ktc_token:
         ktc_encryptionKey sessionKey
         short kvno
         int ticketLen
         char ticket[MAXKTCTICKETLEN]
-    
+
     int ktc_GetToken(ktc_principal *server,
                      ktc_token *token,
                      int tokenLen,
@@ -123,5 +119,17 @@ cdef extern from "afs/prclient.h":
     enum:
         PRSRV
 
+cdef extern from "ubik.h":
+    enum:
+        MAXSERVERS
+
+    # ubik_client is an opaque struct, so we don't care about its members
+    struct ubik_client:
+        pass
+
+    int ubik_ClientInit(rx_connection **serverconns,
+                        ubik_client **aclient)
+    afs_int32 ubik_ClientDestroy(ubik_client *aclient)
+
 cdef extern from "afs/com_err.h":
-    char * error_message(int)
+    char * afs_error_message(int)