r6519: move string handling functions to a seperate file
[samba.git] / source / librpc / ndr / ndr_basic.c
index ef52a10efa7c1d40b5d67dfb740112a9aa429911..31a1c816b4ac1f4a3f0ae40824f410a694550ced 100644 (file)
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "system/network.h"
 
-#define NDR_BE(ndr) (((ndr)->flags & (LIBNDR_FLAG_BIGENDIAN|LIBNDR_FLAG_LITTLE_ENDIAN)) == LIBNDR_FLAG_BIGENDIAN)
 #define NDR_SVAL(ndr, ofs) (NDR_BE(ndr)?RSVAL(ndr->data,ofs):SVAL(ndr->data,ofs))
 #define NDR_IVAL(ndr, ofs) (NDR_BE(ndr)?RIVAL(ndr->data,ofs):IVAL(ndr->data,ofs))
 #define NDR_IVALS(ndr, ofs) (NDR_BE(ndr)?RIVALS(ndr->data,ofs):IVALS(ndr->data,ofs))
@@ -581,465 +580,6 @@ NTSTATUS ndr_push_ref_ptr(struct ndr_push *ndr, const void *p)
        return ndr_push_uint32(ndr, NDR_SCALARS, 0);
 }
 
-/*
-  pull a general string from the wire
-*/
-NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
-{
-       char *as=NULL;
-       uint32_t len1, ofs, len2;
-       uint16_t len3;
-       int ret;
-       int chset = CH_UTF16;
-       unsigned byte_mul = 2;
-       unsigned flags = ndr->flags;
-       unsigned c_len_term = 0;
-
-       if (!(ndr_flags & NDR_SCALARS)) {
-               return NT_STATUS_OK;
-       }
-
-       if (NDR_BE(ndr)) {
-               chset = CH_UTF16BE;
-       }
-
-       if (flags & LIBNDR_FLAG_STR_ASCII) {
-               chset = CH_DOS;
-               byte_mul = 1;
-               flags &= ~LIBNDR_FLAG_STR_ASCII;
-       }
-
-       if (flags & LIBNDR_FLAG_STR_UTF8) {
-               chset = CH_UTF8;
-               byte_mul = 1;
-               flags &= ~LIBNDR_FLAG_STR_UTF8;
-       }
-
-       flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
-       if (flags & LIBNDR_FLAG_STR_CHARLEN) {
-               c_len_term = 1;
-               flags &= ~LIBNDR_FLAG_STR_CHARLEN;
-       }
-
-       switch (flags & LIBNDR_STRING_FLAGS) {
-       case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4:
-       case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &ofs));
-               if (ofs != 0) {
-                       return ndr_pull_error(ndr, NDR_ERR_STRING, "non-zero array offset with string flags 0x%x\n",
-                                             ndr->flags & LIBNDR_STRING_FLAGS);
-               }
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len2));
-               if (len2 > len1) {
-                       return ndr_pull_error(ndr, NDR_ERR_STRING, 
-                                             "Bad string lengths len1=%u ofs=%u len2=%u\n", 
-                                             len1, ofs, len2);
-               }
-               if (len2 == 0) {
-                       *s = talloc_strdup(ndr, "");
-                       break;
-               }
-               NDR_PULL_NEED_BYTES(ndr, (len2 + c_len_term)*byte_mul);
-               ret = convert_string_talloc(ndr, chset, CH_UNIX, 
-                                           ndr->data+ndr->offset, 
-                                           (len2 + c_len_term)*byte_mul,
-                                           (void **)&as);
-               if (ret == -1) {
-                       return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               NDR_CHECK(ndr_pull_advance(ndr, (len2 + c_len_term)*byte_mul));
-
-               /* this is a way of detecting if a string is sent with the wrong
-                  termination */
-               if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-                       if (strlen(as) < (len2 + c_len_term)) {
-                               DEBUG(6,("short string '%s'\n", as));
-                       }
-               } else {
-                       if (strlen(as) == (len2 + c_len_term)) {
-                               DEBUG(6,("long string '%s'\n", as));
-                       }
-               }
-               *s = as;
-               break;
-
-       case LIBNDR_FLAG_STR_SIZE4:
-       case LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
-               NDR_PULL_NEED_BYTES(ndr, (len1 + c_len_term)*byte_mul);
-               if (len1 == 0) {
-                       *s = talloc_strdup(ndr, "");
-                       break;
-               }
-               ret = convert_string_talloc(ndr, chset, CH_UNIX, 
-                                           ndr->data+ndr->offset, 
-                                           (len1 + c_len_term)*byte_mul,
-                                           (void **)&as);
-               if (ret == -1) {
-                       return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               NDR_CHECK(ndr_pull_advance(ndr, (len1 + c_len_term)*byte_mul));
-
-               /* this is a way of detecting if a string is sent with the wrong
-                  termination */
-               if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-                       if (strlen(as) < (len1 + c_len_term)) {
-                               DEBUG(6,("short string '%s'\n", as));
-                       }
-               } else {
-                       if (strlen(as) == (len1 + c_len_term)) {
-                               DEBUG(6,("long string '%s'\n", as));
-                       }
-               }
-               *s = as;
-               break;
-
-       case LIBNDR_FLAG_STR_LEN4:
-       case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_NOTERM:
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &ofs));
-               if (ofs != 0) {
-                       return ndr_pull_error(ndr, NDR_ERR_STRING, "non-zero array offset with string flags 0x%x\n",
-                                             ndr->flags & LIBNDR_STRING_FLAGS);
-               }
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
-               NDR_PULL_NEED_BYTES(ndr, (len1 + c_len_term)*byte_mul);
-               if (len1 == 0) {
-                       *s = talloc_strdup(ndr, "");
-                       break;
-               }
-               ret = convert_string_talloc(ndr, chset, CH_UNIX, 
-                                           ndr->data+ndr->offset, 
-                                           (len1 + c_len_term)*byte_mul,
-                                           (void **)&as);
-               if (ret == -1) {
-                       return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               NDR_CHECK(ndr_pull_advance(ndr, (len1 + c_len_term)*byte_mul));
-
-               /* this is a way of detecting if a string is sent with the wrong
-                  termination */
-               if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-                       if (strlen(as) < (len1 + c_len_term)) {
-                               DEBUG(6,("short string '%s'\n", as));
-                       }
-               } else {
-                       if (strlen(as) == (len1 + c_len_term)) {
-                               DEBUG(6,("long string '%s'\n", as));
-                       }
-               }
-               *s = as;
-               break;
-
-
-       case LIBNDR_FLAG_STR_SIZE2:
-       case LIBNDR_FLAG_STR_SIZE2|LIBNDR_FLAG_STR_NOTERM:
-               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &len3));
-               NDR_PULL_NEED_BYTES(ndr, (len3 + c_len_term)*byte_mul);
-               if (len3 == 0) {
-                       *s = talloc_strdup(ndr, "");
-                       break;
-               }
-               ret = convert_string_talloc(ndr, chset, CH_UNIX, 
-                                           ndr->data+ndr->offset, 
-                                           (len3 + c_len_term)*byte_mul,
-                                           (void **)&as);
-               if (ret == -1) {
-                       return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               NDR_CHECK(ndr_pull_advance(ndr, (len3 + c_len_term)*byte_mul));
-
-               /* this is a way of detecting if a string is sent with the wrong
-                  termination */
-               if (ndr->flags & LIBNDR_FLAG_STR_NOTERM) {
-                       if (strlen(as) < (len3 + c_len_term)) {
-                               DEBUG(6,("short string '%s'\n", as));
-                       }
-               } else {
-                       if (strlen(as) == (len3 + c_len_term)) {
-                               DEBUG(6,("long string '%s'\n", as));
-                       }
-               }
-               *s = as;
-               break;
-
-       case LIBNDR_FLAG_STR_SIZE2|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_BYTESIZE:
-               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &len3));
-               NDR_PULL_NEED_BYTES(ndr, len3);
-               if (len3 == 0) {
-                       *s = talloc_strdup(ndr, "");
-                       break;
-               }
-               ret = convert_string_talloc(ndr, chset, CH_UNIX, 
-                                           ndr->data+ndr->offset, 
-                                           len3,
-                                           (void **)&as);
-               if (ret == -1) {
-                       return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               NDR_CHECK(ndr_pull_advance(ndr, len3));
-               *s = as;
-               break;
-
-       case LIBNDR_FLAG_STR_NULLTERM:
-               if (byte_mul == 1) {
-                       len1 = ascii_len_n((const char *)(ndr->data+ndr->offset), ndr->data_size - ndr->offset);
-               } else {
-                       len1 = utf16_len_n(ndr->data+ndr->offset, ndr->data_size - ndr->offset);
-               }
-               ret = convert_string_talloc(ndr, chset, CH_UNIX, 
-                                           ndr->data+ndr->offset, 
-                                           len1,
-                                           (void **)&as);
-               if (ret == -1) {
-                       return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               NDR_CHECK(ndr_pull_advance(ndr, len1));
-               *s = as;
-               break;
-
-       case LIBNDR_FLAG_STR_FIXLEN15:
-       case LIBNDR_FLAG_STR_FIXLEN32:
-               len1 = (flags & LIBNDR_FLAG_STR_FIXLEN32)?32:15;
-               NDR_PULL_NEED_BYTES(ndr, len1*byte_mul);
-               ret = convert_string_talloc(ndr, chset, CH_UNIX, 
-                                           ndr->data+ndr->offset, 
-                                           len1*byte_mul,
-                                           (void **)&as);
-               if (ret == -1) {
-                       return ndr_pull_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               NDR_CHECK(ndr_pull_advance(ndr, len1*byte_mul));
-               *s = as;
-               break;
-
-       default:
-               return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x\n",
-                                     ndr->flags & LIBNDR_STRING_FLAGS);
-       }
-
-       return NT_STATUS_OK;
-}
-
-
-/*
-  push a general string onto the wire
-*/
-NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
-{
-       ssize_t s_len, c_len, d_len;
-       int ret;
-       int chset = CH_UTF16;
-       unsigned flags = ndr->flags;
-       unsigned byte_mul = 2;
-       unsigned c_len_term = 1;
-
-       if (!(ndr_flags & NDR_SCALARS)) {
-               return NT_STATUS_OK;
-       }
-
-       if (NDR_BE(ndr)) {
-               chset = CH_UTF16BE;
-       }
-       
-       s_len = s?strlen(s):0;
-       c_len = s?strlen_m(s):0;
-
-       if (flags & LIBNDR_FLAG_STR_ASCII) {
-               chset = CH_DOS;
-               byte_mul = 1;
-               flags &= ~LIBNDR_FLAG_STR_ASCII;
-       }
-
-       if (flags & LIBNDR_FLAG_STR_UTF8) {
-               chset = CH_UTF8;
-               byte_mul = 1;
-               flags &= ~LIBNDR_FLAG_STR_UTF8;
-       }
-
-       flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
-
-       if (flags & LIBNDR_FLAG_STR_CHARLEN) {
-               c_len_term = 0;
-               flags &= ~LIBNDR_FLAG_STR_CHARLEN;
-       }
-
-       switch (flags & LIBNDR_STRING_FLAGS) {
-       case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4:
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len+c_len_term));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len+c_len_term));
-               NDR_PUSH_NEED_BYTES(ndr, byte_mul*(c_len+1));
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len+1,
-                                    ndr->data+ndr->offset, 
-                                    byte_mul*(c_len+1));
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += byte_mul*(c_len+1);
-               break;
-
-       case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
-               NDR_PUSH_NEED_BYTES(ndr, c_len*byte_mul);
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len,
-                                    ndr->data+ndr->offset, c_len*byte_mul);
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += c_len*byte_mul;
-               break;
-
-       case LIBNDR_FLAG_STR_LEN4:
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len + c_len_term));
-               NDR_PUSH_NEED_BYTES(ndr, byte_mul*(c_len+1));
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len + 1,
-                                    ndr->data+ndr->offset, byte_mul*(c_len+1));
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += byte_mul*(c_len+1);
-               break;
-
-       case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_NOTERM:
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));
-               NDR_PUSH_NEED_BYTES(ndr, byte_mul*c_len);
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len,
-                                    ndr->data+ndr->offset, byte_mul*c_len);
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += byte_mul*c_len;
-               break;
-
-       case LIBNDR_FLAG_STR_SIZE4:
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len + c_len_term));
-               NDR_PUSH_NEED_BYTES(ndr, byte_mul*(c_len+1));
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len + 1,
-                                    ndr->data+ndr->offset, byte_mul*(c_len+1));
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += byte_mul*(c_len+1);
-               break;
-
-       case LIBNDR_FLAG_STR_SIZE2:
-               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, c_len + c_len_term));
-               NDR_PUSH_NEED_BYTES(ndr, byte_mul*(c_len+1));
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len + 1,
-                                    ndr->data+ndr->offset, byte_mul*(c_len+1));
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += byte_mul*(c_len+1);
-               break;
-
-       case LIBNDR_FLAG_STR_NULLTERM:
-               NDR_PUSH_NEED_BYTES(ndr, byte_mul*(c_len+1));
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len+1,
-                                    ndr->data+ndr->offset, byte_mul*(c_len+1));
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += byte_mul*(c_len+1);
-               break;
-
-       case LIBNDR_FLAG_STR_SIZE2|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_BYTESIZE:
-               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, c_len*byte_mul));
-               NDR_PUSH_NEED_BYTES(ndr, c_len*byte_mul);
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len,
-                                    ndr->data+ndr->offset, c_len*byte_mul);
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += c_len*byte_mul;
-               break;
-
-       case LIBNDR_FLAG_STR_FIXLEN15:
-       case LIBNDR_FLAG_STR_FIXLEN32:
-               d_len = (flags & LIBNDR_FLAG_STR_FIXLEN32)?32:15;
-               NDR_PUSH_NEED_BYTES(ndr, byte_mul*d_len);
-               ret = convert_string(CH_UNIX, chset, 
-                                    s, s_len,
-                                    ndr->data+ndr->offset, byte_mul*d_len);
-               if (ret == -1) {
-                       return ndr_push_error(ndr, NDR_ERR_CHARCNV, 
-                                             "Bad character conversion");
-               }
-               ndr->offset += byte_mul*d_len;
-               break;
-
-       default:
-               return ndr_push_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x\n",
-                                     ndr->flags & LIBNDR_STRING_FLAGS);
-       }
-
-       return NT_STATUS_OK;
-}
-
-/*
-  push a general string onto the wire
-*/
-size_t ndr_string_array_size(struct ndr_push *ndr, const char *s)
-{
-       size_t c_len;
-       unsigned flags = ndr->flags;
-       unsigned byte_mul = 2;
-       unsigned c_len_term = 1;
-
-       if (flags & LIBNDR_FLAG_STR_FIXLEN32) {
-               return 32;
-       }
-       if (flags & LIBNDR_FLAG_STR_FIXLEN15) {
-               return 15;
-       }
-       
-       c_len = s?strlen_m(s):0;
-
-       if (flags & (LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_UTF8)) {
-               byte_mul = 1;
-       }
-
-       if (flags & LIBNDR_FLAG_STR_NOTERM) {
-               c_len_term = 0;
-       }
-
-       c_len = c_len + c_len_term;
-
-       if (flags & LIBNDR_FLAG_STR_BYTESIZE) {
-               c_len = c_len * byte_mul;
-       }
-
-       return c_len;
-}
-
 
 /*
   push a NTTIME
@@ -1246,15 +786,6 @@ void ndr_print_ptr(struct ndr_print *ndr, const char *name, const void *p)
        }
 }
 
-void ndr_print_string(struct ndr_print *ndr, const char *name, const char *s)
-{
-       if (s) {
-               ndr->print(ndr, "%-25s: '%s'", name, s);
-       } else {
-               ndr->print(ndr, "%-25s: NULL", name);
-       }
-}
-
 void ndr_print_NTTIME(struct ndr_print *ndr, const char *name, NTTIME t)
 {
        ndr->print(ndr, "%-25s: %s", name, nt_time_string(ndr, t));
@@ -1456,10 +987,3 @@ uint32_t ndr_size_DATA_BLOB(int ret, const DATA_BLOB *data, int flags)
 {
        return ret + data->length;
 }
-
-uint32_t ndr_size_string(int ret, const char * const* string, int flags) 
-{
-       /* FIXME: Is this correct for all strings ? */
-       if(!(*string)) return ret;
-       return ret+strlen(*string)+1;
-}