Changeset 706:4ffbc9f1e922 in freeDiameter for extensions/dbg_interactive/sessions.i

Timestamp:

Feb 9, 2011, 3:26:58 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Large UNTESTED commit with the following changes:

• Improved DiameterIdentity? handling (esp. interationalization issues), and improve efficiency of some string operations in peers, sessions, and dictionary modules (closes #7)
• Cleanup in the session module to free only unreferenced sessions (#16)
• Removed fd_cpu_flush_cache(), replaced by more robust alternatives.
• Improved peer state machine algorithm to counter SCTP multistream race condition.

File:

• extensions/dbg_interactive/sessions.i (modified) (5 diffs)

extensions/dbg_interactive/sessions.i

@@ -40 +40 @@
 %{
 /* call it (might be called from a different thread than the interpreter, when session times out) */
-static void call_the_python_cleanup_callback(session_state * state, char * sid, void * cb) {
+static void call_the_python_cleanup_callback(session_state * state, os0_t sid, void * cb) {
         PyObject *result;
         if (!cb) {
@@ -100 +100 @@
                 int ret;
                 struct session * s = NULL;
-                ret = fd_sess_new(&s, fd_g_config->cnf_diamid, "dbg_interactive", sizeof("dbg_interactive"));
+                ret = fd_sess_new(&s, fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len, (os0_t)"dbg_interactive", CONSTSTRLEN("dbg_interactive"));
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -110 +110 @@
                 int ret;
                 struct session * s = NULL;
-                ret = fd_sess_new(&s, diamid, STRING, LENGTH);
+                ret = fd_sess_new(&s, diamid, 0, (os0_t)STRING, LENGTH);
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -120 +120 @@
                 int ret, n;
                 struct session * s = NULL;
-                ret = fd_sess_fromsid(STRING, LENGTH, &s, &n);
+                ret = fd_sess_fromsid((os0_t)STRING, LENGTH, &s, &n);
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -144 +144 @@
                 return;
         }
-        char * getsid() {
+        
+        %cstring_output_allocate_size(char ** outsid, size_t * sidlen, /* do not free */);
+        void getsid(char ** outsid, size_t * sidlen) {
                 int ret;
-                char * sid = NULL;
-                ret = fd_sess_getsid( $self, &sid);
+                ret = fd_sess_getsid( $self, (void *)outsid, sidlen);
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
-                        return NULL;
+                        return;
                 }
-                return sid;
+                return;
         }
         void settimeout(long seconds) {