Changeset 1040 for pjproject/trunk/pjlib-util/src/pjlib-util/stun_msg.c

Timestamp:

Mar 5, 2007 12:58:24 AM (17 years ago)

Author:

bennylp

Message:

Implemented new STUN server framework

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/stun_msg.c (modified) (18 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/stun_msg.c

@@ -527 +527 @@
                      addr_len == sizeof(pj_sockaddr_in6), PJ_EINVAL);
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_ip_addr_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_ip_addr_attr);
     INIT_ATTR(attr, attr_type, STUN_GENERIC_IP_ADDR_LEN);
 
@@ -581 +581 @@
 
     /* Create the attribute */
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_ip_addr_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_ip_addr_attr);
     pj_memcpy(attr, buf, ATTR_HDR_LEN);
 
@@ -674 +674 @@
     PJ_ASSERT_RETURN(pool && value && p_attr, PJ_EINVAL);
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_string_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_string_attr);
     INIT_ATTR(attr, attr_type, value->slen);
     pj_strdup(pool, &attr->value, value);
@@ -713 +713 @@
 
     /* Create the attribute */
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_string_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_string_attr);
 
     /* Copy the header */
@@ -787 +787 @@
     PJ_ASSERT_RETURN(pool && p_attr, PJ_EINVAL);
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_empty_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_empty_attr);
     INIT_ATTR(attr, attr_type, sizeof(pj_stun_empty_attr));
 
@@ -806 +806 @@
 
     /* Create the attribute */
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_empty_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_empty_attr);
     pj_memcpy(attr, buf, ATTR_HDR_LEN);
 
@@ -865 +865 @@
     PJ_ASSERT_RETURN(pool && p_attr, PJ_EINVAL);
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_uint_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr);
     INIT_ATTR(attr, attr_type, STUN_UINT_LEN);
     attr->value = value;
@@ -905 +905 @@
 
     /* Create the attribute */
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_uint_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_uint_attr);
     pj_memcpy(attr, buf, ATTR_LEN);
 
@@ -968 +968 @@
     PJ_ASSERT_RETURN(pool && p_attr, PJ_EINVAL);
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_msgint_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_msgint_attr);
     INIT_ATTR(attr, PJ_STUN_ATTR_MESSAGE_INTEGRITY, STUN_MSG_INTEGRITY_LEN);
 
@@ -1004 +1004 @@
 
     /* Create attribute */
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_msgint_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_msgint_attr);
     pj_memcpy(attr, buf, sizeof(pj_stun_msgint_attr));
     attr->hdr.type = pj_ntohs(attr->hdr.type);
@@ -1074 +1074 @@
     }
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_errcode_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr);
     INIT_ATTR(attr, PJ_STUN_ATTR_ERROR_CODE, 4+err_reason->slen);
     attr->err_class = (pj_uint8_t)(err_code / 100);
@@ -1110 +1110 @@
 
     /* Create the attribute */
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_errcode_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_errcode_attr);
 
     /* Copy the header */
@@ -1187 +1187 @@
     PJ_ASSERT_RETURN(pool && attr_cnt < PJ_STUN_MAX_ATTR && p_attr, PJ_EINVAL);
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_unknown_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_unknown_attr);
     INIT_ATTR(attr, PJ_STUN_ATTR_UNKNOWN_ATTRIBUTES, attr_cnt * 2);
 
@@ -1233 +1233 @@
     unsigned i;
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_unknown_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_unknown_attr);
     pj_memcpy(attr, buf, ATTR_HDR_LEN);
 
@@ -1310 +1310 @@
     PJ_ASSERT_RETURN(pool && attr_type && p_attr, PJ_EINVAL);
 
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_binary_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_binary_attr);
     INIT_ATTR(attr, attr_type, sizeof(pj_stun_binary_attr));
 
@@ -1352 +1352 @@
 
     /* Create the attribute */
-    attr = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_binary_attr);
+    attr = PJ_POOL_ZALLOC_T(pool, pj_stun_binary_attr);
 
     /* Copy the header */
@@ -1419 +1419 @@
     PJ_ASSERT_RETURN(pool && msg_type && p_msg, PJ_EINVAL);
 
-    msg = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_msg);
+    msg = PJ_POOL_ZALLOC_T(pool, pj_stun_msg);
     msg->hdr.type = (pj_uint16_t) msg_type;
     msg->hdr.magic = magic;
@@ -1606 +1606 @@
 
     /* Create the message, copy the header, and convert to host byte order */
-    msg = PJ_POOL_ZALLOC_TYPE(pool, pj_stun_msg);
+    msg = PJ_POOL_ZALLOC_T(pool, pj_stun_msg);
     pj_memcpy(&msg->hdr, pdu, sizeof(pj_stun_msg_hdr));
     msg->hdr.type = pj_ntohs(msg->hdr.type);