Changeset 1986

Timestamp:

Jun 6, 2008 2:12:23 PM (16 years ago)

Author:

bennylp

Message:

More ticket #531: added user_data parameter in activesocket creation API to make it more robust against programming errors

Location:

pjproject/trunk/pjlib

Files:

• include/pj/activesock.h (modified) (4 diffs)
• src/pj/activesock.c (modified) (4 diffs)
• src/pjlib-test/activesock.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/activesock.h

@@ -228 +228 @@
  * @param cb            Pointer to structure containing application
  *                      callbacks.
+ * @param user_data     Arbitrary user data to be associated with this
+ *                      active socket.
  * @param p_asock       Pointer to receive the active socket instance.
  *
@@ -239 +241 @@
                                           pj_ioqueue_t *ioqueue,
                                           const pj_activesock_cb *cb,
+                                          void *user_data,
                                           pj_activesock_t **p_asock);
 
@@ -254 +257 @@
  * @param cb            Pointer to structure containing application
  *                      callbacks.
+ * @param user_data     Arbitrary user data to be associated with this
+ *                      active socket.
  * @param p_asock       Pointer to receive the active socket instance.
  * @param bound_addr    If this argument is specified, it will be filled with
@@ -266 +271 @@
                                               pj_ioqueue_t *ioqueue,
                                               const pj_activesock_cb *cb,
+                                              void *user_data,
                                               pj_activesock_t **p_asock,
                                               pj_sockaddr *bound_addr);

pjproject/trunk/pjlib/src/pj/activesock.c

@@ -98 +98 @@
                                           pj_ioqueue_t *ioqueue,
                                           const pj_activesock_cb *cb,
+                                          void *user_data,
                                           pj_activesock_t **p_asock)
 {
@@ -115 +116 @@
     asock->async_count = (opt? opt->async_cnt : 1);
     asock->max_loop = PJ_ACTIVESOCK_MAX_LOOP;
+    asock->user_data = user_data;
     pj_memcpy(&asock->cb, cb, sizeof(*cb));
 
@@ -144 +146 @@
                                               pj_ioqueue_t *ioqueue,
                                               const pj_activesock_cb *cb,
+                                              void *user_data,
                                               pj_activesock_t **p_asock,
                                               pj_sockaddr *bound_addr)
@@ -169 +172 @@
 
     status = pj_activesock_create(pool, sock_fd, pj_SOCK_DGRAM(), opt,
-                                  ioqueue, cb, p_asock);
+                                  ioqueue, cb, user_data, p_asock);
     if (status != PJ_SUCCESS) {
         pj_sock_close(sock_fd);

pjproject/trunk/pjlib/src/pjlib-test/activesock.c

@@ -115 +115 @@
 
     status = pj_activesock_create_udp(pool, &addr, NULL, ioqueue, &activesock_cb, 
-                                      &srv->asock, &addr);
+                                      srv, &srv->asock, &addr);
     if (status != PJ_SUCCESS) {
         pj_sock_close(sock_fd);
@@ -124 +124 @@
     srv->port = pj_ntohs(addr.ipv4.sin_port);
 
-    pj_activesock_set_user_data(srv->asock, srv);
     pj_ioqueue_op_key_init(&srv->send_key, sizeof(srv->send_key));