Changeset 6 for trunk/samba-3.0.25pre1/source/ndpsmb/smbwrp.c

Timestamp:

Mar 25, 2007, 12:49:08 PM (18 years ago)

Author:

Yuri Dario

Message:

Client code changes for 3.0.25 upgrade.

File:

• trunk/samba-3.0.25pre1/source/ndpsmb/smbwrp.c (modified) (38 diffs)

trunk/samba-3.0.25pre1/source/ndpsmb/smbwrp.c

@@ -35 +35 @@
         initialised = 1;
 
-        init_globals();
+        load_case_tables();
+
+        init_globals( True);
 
         load_interfaces();
@@ -191 +193 @@
 
         if (c_time) {
-                *c_time = interpret_long_date(rdata+0) - cli->serverzone;
+                *c_time = convert_timespec_to_time_t(interpret_long_date(rdata+0)) - cli->serverzone;
         }
         if (a_time) {
-                *a_time = interpret_long_date(rdata+8) - cli->serverzone;
+                *a_time = convert_timespec_to_time_t(interpret_long_date(rdata+8)) - cli->serverzone;
         }
         if (m_time) {
-                *m_time = interpret_long_date(rdata+16) - cli->serverzone;
+                *m_time = convert_timespec_to_time_t(interpret_long_date(rdata+16)) - cli->serverzone;
         }
         if (w_time) {
-                *w_time = interpret_long_date(rdata+24) - cli->serverzone;
+                *w_time = convert_timespec_to_time_t(interpret_long_date(rdata+24)) - cli->serverzone;
         }
         if (mode) {
@@ -262 +264 @@
 
         if (c_time) {
-                *c_time = interpret_long_date(rdata+0) - cli->serverzone;
+                *c_time = convert_timespec_to_time_t(interpret_long_date(rdata+0)) - cli->serverzone;
         }
         if (a_time) {
-                *a_time = interpret_long_date(rdata+8) - cli->serverzone;
+                *a_time = convert_timespec_to_time_t(interpret_long_date(rdata+8)) - cli->serverzone;
         }
         if (m_time) {
-                *m_time = interpret_long_date(rdata+16) - cli->serverzone;
+                *m_time = convert_timespec_to_time_t(interpret_long_date(rdata+16)) - cli->serverzone;
         }
         if (w_time) {
-                *w_time = interpret_long_date(rdata+24) - cli->serverzone;
+                *w_time = convert_timespec_to_time_t(interpret_long_date(rdata+24)) - cli->serverzone;
         }
         if (mode) {
@@ -291 +293 @@
 return a connection to a server
 *******************************************************/
-int _System smbwrp_connect(smbwrp_server * srv, cli_state * c)
+int _System smbwrp_connect(smbwrp_server * srv, struct cli_state * cli)
 {
         char * server = srv->server_name;
@@ -300 +302 @@
         fstring group;
         struct in_addr ip;
-        int rc;
-
-        zero_ip(&ip);
-        ZERO_STRUCTP(c);
+        NTSTATUS rc;
+        struct cli_state * c;
+
+        zero_ip(&ip);
 
         DEBUG(1,("Connecting to \\\\%s:%s@%s:%s\\%s. Master %s:%d\n", srv->username, srv->password, workgroup, server, share, srv->master, srv->ifmastergroup));
@@ -343 +345 @@
 
         /* have to open a new connection */
-        if (!cli_initialise(c))
+        if (!(c=cli_initialise()))
         {
                 return 2;
@@ -370 +372 @@
         DEBUG(4,(" session setuping for <%s>/<%s> %d in <%s> %08x %08x %08x\n", srv->username, srv->password, strlen(srv->password), workgroup, c->protocol, c->sec_mode, c->capabilities));
 
-        rc = cli_session_setup(c, srv->username, 
+        if (!NT_STATUS_IS_OK(cli_session_setup(c, srv->username, 
                                srv->password, strlen(srv->password),
                                srv->password, strlen(srv->password),
-                               workgroup);
-        if (!rc)
-        {
+                               workgroup))) {
                 DEBUG(4,("%s/%s login failed\n", srv->username, srv->password));
                 /* try an anonymous login if it failed */
-                rc = cli_session_setup(c, "", "", 1,"", 0, workgroup);
-                if (!rc)
-                {
+                if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 1,"", 0, workgroup))) {
                         DEBUG(4,("Anonymous login failed"));
                         cli_shutdown(c);
@@ -396 +394 @@
 
         DEBUG(4,(" tconx ok. cli caps %08x\n", c->capabilities));
+
+        // copy back cli_state
+        memcpy( cli, c, sizeof( struct cli_state));
 
 //      srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
@@ -441 +442 @@
                 time_t t;
                 file->mtime = time(NULL);
-                t = TimeDiff(file->mtime);
+                t = get_time_zone(file->mtime);
                 DEBUG(4,("cli_open mtime %lu %lu\n", file->mtime, t));
                 file->mtime -= t;
@@ -520 +521 @@
         if (file->openattr || file->mtime)
         {
-                DEBUG(4,("Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime + TimeDiff(file->mtime)));
-                if (!cli_setatr(cli, file->fname, file->openattr, file->mtime + TimeDiff(file->mtime))) 
+                DEBUG(4,("Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime + get_time_zone(file->mtime)));
+                if (!cli_setatr(cli, file->fname, file->openattr, file->mtime + get_time_zone(file->mtime))) 
                 {
                         DEBUG(4,("Set attr on close failed %d\n", os2cli_errno(cli)));
@@ -635 +636 @@
         }
 
-DEBUG(4,("Setting on <%s> attr %04x, time %lu/%lu\n", finfo->fname, finfo->attr, finfo->mtime, finfo->mtime + TimeDiff(finfo->mtime)));
-        if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime + (finfo->mtime == 0 ? 0 : TimeDiff(finfo->mtime)))
+DEBUG(4,("Setting on <%s> attr %04x, time %lu/%lu\n", finfo->fname, finfo->attr, finfo->mtime, finfo->mtime + get_time_zone(finfo->mtime)));
+        if (!cli_setatr(cli, finfo->fname, finfo->attr, finfo->mtime + (finfo->mtime == 0 ? 0 : get_time_zone(finfo->mtime)))
                 && !cli_setatr(cli, finfo->fname, finfo->attr, 0)) 
         {
@@ -737 +738 @@
                 finfo->attr &= 0x7F;
 //DEBUG(2,("gotattr %08x <%s>\n", finfo->attr, finfo->fname));
-//              finfo->ctime -= TimeDiff(finfo->ctime);
-//              finfo->atime -= TimeDiff(finfo->atime);
-//              finfo->mtime -= TimeDiff(finfo->mtime);
+//              finfo->ctime -= get_time_zone(finfo->ctime);
+//              finfo->atime -= get_time_zone(finfo->atime);
+//              finfo->mtime -= get_time_zone(finfo->mtime);
                 return 0;
         }
@@ -761 +762 @@
         {
 //DEBUG(2,("gotattr1 %08x <%s>\n", finfo->attr, finfo->fname));
-                finfo->mtime -= TimeDiff(finfo->mtime);
+                finfo->mtime -= get_time_zone(finfo->mtime);
                 finfo->atime = finfo->mtime;
                 finfo->ctime = finfo->mtime;
@@ -794 +795 @@
                 else
                 {
-                        finfo->ctime -= TimeDiff(finfo->ctime);
-                        finfo->atime -= TimeDiff(finfo->atime);
-                        finfo->mtime -= TimeDiff(finfo->mtime);
+                        finfo->ctime -= get_time_zone(finfo->ctime);
+                        finfo->atime -= get_time_zone(finfo->atime);
+                        finfo->mtime -= get_time_zone(finfo->mtime);
                 }
         }
         else
         {
-//              finfo->ctime -= TimeDiff(finfo->ctime);
-//              finfo->atime -= TimeDiff(finfo->atime);
-//              finfo->mtime -= TimeDiff(finfo->mtime);
+//              finfo->ctime -= get_time_zone(finfo->ctime);
+//              finfo->atime -= get_time_zone(finfo->atime);
+//              finfo->mtime -= get_time_zone(finfo->mtime);
         }
 
@@ -814 +815 @@
 add a entry to a directory listing
 *******************************************************/
-static void smbwrp_dir_add(smbwrp_fileinfo *finfo, const char *mask, void *state)
+static void smbwrp_dir_add(const char* mnt, smbwrp_fileinfo *finfo, const char *mask, void *state)
 {
         if (state && finfo)
@@ -827 +828 @@
         }
 }
-
+#if 0
 static void smbwrp_dir_add_old(struct file_info *finfo, const char *mask, void *state)
 {
@@ -839 +840 @@
                         st->finfo.easize = -1;
                         st->finfo.attr = finfo->mode;
-                        st->finfo.ctime = finfo->ctime - TimeDiff(finfo->ctime);
-                        st->finfo.mtime = finfo->mtime - TimeDiff(finfo->mtime);
-                        st->finfo.atime = finfo->atime - TimeDiff(finfo->atime);
+                        st->finfo.ctime = finfo->ctime_ts.tv_sec - get_time_zone(finfo->ctime_ts.tv_sec);
+                        st->finfo.mtime = finfo->mtime_ts.tv_sec - get_time_zone(finfo->mtime_ts.tv_sec);
+                        st->finfo.atime = finfo->atime_ts.tv_sec - get_time_zone(finfo->atime_ts.tv_sec);
                         st->add_dir_entry(state);
                 }
         }
 }
-
-static void smbwrp_special_add(char * name, void * state)
+#endif
+
+static void smbwrp_special_add(const char * name, void * state)
 {
         smbwrp_fileinfo finfo = {0};
@@ -861 +863 @@
         finfo.attr = aRONLY | aDIR;
 
-        smbwrp_dir_add(&finfo, NULL, state);
+        smbwrp_dir_add("", &finfo, NULL, state);
 }
 
@@ -873 +875 @@
 
         strncpy(finfo.fname, job->name, sizeof(finfo.fname) - 1);
-        finfo.mtime = job->t - TimeDiff(job->t);
+        finfo.mtime = job->t - get_time_zone(job->t);
         finfo.atime = finfo.mtime;
         finfo.ctime = finfo.mtime;
@@ -879 +881 @@
         finfo.size = job->size;
 
-        smbwrp_dir_add(&finfo, NULL, state);
+        smbwrp_dir_add("", &finfo, NULL, state);
 }
 
@@ -894 +896 @@
         finfo.attr = aRONLY | aDIR;     
 
-        smbwrp_dir_add(&finfo, NULL, state);
-}
-
+        smbwrp_dir_add("", &finfo, NULL, state);
+}
 
 /****************************************************************************
@@ -904 +905 @@
  by NT and 2 is used by OS/2
 ****************************************************************************/
-
-static int interpret_long_filename(struct cli_state *cli,
-                                   int level,char *p,smbwrp_fileinfo *finfo)
+// YD from libsmb\clilist.c
+static size_t _os2_interpret_long_filename(struct cli_state *cli,
+                                   int level,char *p, smbwrp_fileinfo *finfo,
+                                        uint32 *p_resume_key, DATA_BLOB *p_last_name_raw, uint32 *p_last_name_raw_len)
 {
         extern file_info def_finfo;
@@ -917 +919 @@
 //      memcpy(finfo,&def_finfo,sizeof(*finfo));
         finfo->attr = def_finfo.mode;
-        finfo->mtime = def_finfo.mtime;
-        finfo->atime = def_finfo.atime;
-        finfo->ctime = def_finfo.ctime;
+        finfo->mtime = def_finfo.mtime_ts.tv_sec;
+        finfo->atime = def_finfo.atime_ts.tv_sec;
+        finfo->ctime = def_finfo.ctime_ts.tv_sec;
         strncpy(finfo->fname, def_finfo.name, sizeof(finfo->fname) - 1);
 
@@ -926 +928 @@
                         /* these dates are converted to GMT by
                            make_unix_date */
-                        finfo->ctime = make_unix_date2(p+4);
-                        finfo->atime = make_unix_date2(p+8);
-                        finfo->mtime = make_unix_date2(p+12);
+                        finfo->ctime = cli_make_unix_date2(cli, p+4);
+                        finfo->atime = cli_make_unix_date2(cli, p+8);
+                        finfo->mtime = cli_make_unix_date2(cli, p+12);
                         finfo->size = IVAL(p,16);
                         finfo->attr = CVAL(p,24);
@@ -948 +950 @@
                         /* these dates are converted to GMT by
                            make_unix_date */
-                        finfo->ctime = make_unix_date2(p+4);
-                        finfo->atime = make_unix_date2(p+8);
-                        finfo->mtime = make_unix_date2(p+12);
+                        finfo->ctime = cli_make_unix_date2(cli, p+4);
+                        finfo->atime = cli_make_unix_date2(cli, p+8);
+                        finfo->mtime = cli_make_unix_date2(cli, p+12);
                         finfo->size = IVAL(p,16);
                         finfo->attr = CVAL(p,24);
@@ -967 +969 @@
                         size_t namelen, slen;
                         p += 4; /* next entry offset */
+#if 0
+                        if (p_resume_key) {
+                                *p_resume_key = IVAL(p,0);
+                        }
+#endif
                         p += 4; /* fileindex */
                                 
-                        /* these dates appear to arrive in a
-                           weird way. It seems to be localtime
-                           plus the serverzone given in the
-                           initial connect. This is GMT when
-                           DST is not in effect and one hour
-                           from GMT otherwise. Can this really
-                           be right??
-                           
-                           I suppose this could be called
-                           kludge-GMT. Is is the GMT you get
-                           by using the current DST setting on
-                           a different localtime. It will be
-                           cheap to calculate, I suppose, as
-                           no DST tables will be needed */
-                        
-                        finfo->ctime = interpret_long_date(p);
+                        /* Offset zero is "create time", not "change time". */
                         p += 8;
-                        finfo->atime = interpret_long_date(p);
+                        finfo->atime = interpret_long_date(p).tv_sec;
                         p += 8;
-                        finfo->mtime = interpret_long_date(p);
+                        finfo->mtime = interpret_long_date(p).tv_sec;
                         p += 8;
+                        finfo->ctime = interpret_long_date(p).tv_sec;
                         p += 8;
                         finfo->size = IVAL2_TO_SMB_BIG_UINT(p,0);
@@ -998 +991 @@
                         namelen = IVAL(p,0);
                         p += 4;
-                        finfo->easize = IVAL(p,0);
                         p += 4; /* EA size */
                         slen = SVAL(p, 0);
                         p += 2; 
+#if 0                   
+                        {
+                                /* stupid NT bugs. grr */
+                                int flags = 0;
+                                if (p[1] == 0 && namelen > 1) flags |= STR_UNICODE;
+                                clistr_pull(cli, finfo->short_name, p,
+                                            sizeof(finfo->short_name),
+                                            slen, flags);
+                        }
+#endif
                         p += 24; /* short name? */        
                         clistr_pull(cli, finfo->fname, p,
                                     sizeof(finfo->fname),
                                     namelen, 0);
-                        return SVAL(base, 0);
+
+                        /* To be robust in the face of unicode conversion failures
+                           we need to copy the raw bytes of the last name seen here.
+                           Namelen doesn't include the terminating unicode null, so
+                           copy it here. */
+#if 0
+                        if (p_last_name_raw && p_last_name_raw_len) {
+                                if (namelen + 2 > p_last_name_raw->length) {
+                                        memset(p_last_name_raw->data, '\0', sizeof(p_last_name_raw->length));
+                                        *p_last_name_raw_len = 0;
+                                } else {
+                                        memcpy(p_last_name_raw->data, p, namelen);
+                                        SSVAL(p_last_name_raw->data, namelen, 0);
+                                        *p_last_name_raw_len = namelen + 2;
+                                }
+                        }
+#endif
+                        return (size_t)IVAL(base, 0);
                 }
         }
         
         DEBUG(1,("Unknown long filename format %d\n",level));
-        return(SVAL(p,0));
+        return (size_t)IVAL(base,0);
 }
 
@@ -1020 +1039 @@
 
 static int list_files(struct cli_state *cli, const char *Mask, uint16 attribute, 
-                 void (*fn)(smbwrp_fileinfo *, const char *, void *), void *state)
-{
+                 void (*fn)(const char*, smbwrp_fileinfo *, const char *, void *), void *state)
+{
+#if 1
+        int max_matches = 1366; /* Match W2k - was 512. */
+#else
         int max_matches = 512;
+#endif
         int info_level;
         char *p, *p2;
@@ -1034 +1057 @@
         int ff_searchcount=0;
         int ff_eos=0;
-        int ff_lastname=0;
+        //int ff_lastname=0;
         int ff_dir_handle=0;
         int loop_count = 0;
@@ -1041 +1064 @@
         uint16 setup;
         pstring param;
+        const char *mnt;
+        uint32 resume_key = 0;
+        uint32 last_name_raw_len = 0;
+        DATA_BLOB last_name_raw = data_blob(NULL, 2*sizeof(pstring));
 
         /* NT uses 260, OS/2 uses 2. Both accept 1. */
@@ -1047 +1074 @@
         DEBUG(4,("list_files level %d. mask <%s>\n", info_level, mask));
 
-        pstrcpy(mask,Mask);
-        
+        /* when getting a directory listing from a 2k dfs root share, 
+           we have to include the full path (\server\share\mask) here */
+           
+        if ( cli->dfsroot )
+                pstr_sprintf( mask, "\\%s\\%s\\%s", cli->desthost, cli->share, Mask );
+        else
+                pstrcpy(mask,Mask);
+
         while (ff_eos == 0) {
                 loop_count++;
@@ -1060 +1093 @@
                         SSVAL(param,0,attribute); /* attribute */
                         SSVAL(param,2,max_matches); /* max count */
-                        SSVAL(param,4,4+2);     /* resume required + close on end */
+                        //SSVAL(param,4,4+2);   /* resume required + close on end */
+                        SSVAL(param,4,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END)); /* resume required + close on end */
                         SSVAL(param,6,info_level); 
                         SIVAL(param,8,0);
@@ -1070 +1104 @@
                         SSVAL(param,0,ff_dir_handle);
                         SSVAL(param,2,max_matches); /* max count */
+                        //SIVAL(param,6,0); /* ff_resume_key */
                         SSVAL(param,4,info_level); 
-                        SIVAL(param,6,0); /* ff_resume_key */
-                        SSVAL(param,10,8+4+2);  /* continue + resume required + close on end */
+                        /* For W2K servers serving out FAT filesystems we *must* set the
+                           resume key. If it's not FAT then it's returned as zero. */
+                        SIVAL(param,6,resume_key); /* ff_resume_key */
+                        /* NB. *DON'T* use continue here. If you do it seems that W2K and bretheren
+                           can miss filenames. Use last filename continue instead. JRA */
+                        SSVAL(param,10,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END));        /* resume required + close on end */
+                        //SSVAL(param,10,8+4+2);        /* continue + resume required + close on end */
                         p = param+12;
-                        p += clistr_push(cli, param+12, mask, sizeof(param)-12, 
-                                         STR_TERMINATE);
+                        //p += clistr_push(cli, param+12, mask, sizeof(param)-12, 
+                        //               STR_TERMINATE);
+                        if (last_name_raw_len && (last_name_raw_len < (sizeof(param)-12))) {
+                                memcpy(p, last_name_raw.data, last_name_raw_len);
+                                p += last_name_raw_len;
+                        } else {
+                                p += clistr_push(cli, param+12, mask, sizeof(param)-12, STR_TERMINATE);
+                        }
                 }
 
@@ -1103 +1149 @@
                         uint8 eclass;
                         uint32 ecode;
+
+                        SAFE_FREE(rdata);
+                        SAFE_FREE(rparam);
+
                         cli_dos_error(cli, &eclass, &ecode);
                         if (eclass != ERRSRV || ecode != ERRerror)
@@ -1120 +1170 @@
                                 continue;
                         }
+                        SAFE_FREE(rdata);
+                        SAFE_FREE(rparam);
                         break;
                 }
@@ -1132 +1184 @@
                         ff_searchcount = SVAL(p,2);
                         ff_eos = SVAL(p,4);
-                        ff_lastname = SVAL(p,8);
+                        //ff_lastname = SVAL(p,8);
                 } else {
                         ff_searchcount = SVAL(p,0);
                         ff_eos = SVAL(p,2);
-                        ff_lastname = SVAL(p,6);
-                }
-                DEBUG(4,("list_files %d %d %d %d\n", ff_searchcount, ff_eos, ff_lastname, First));
-
-                if (ff_searchcount == 0) 
+                        //ff_lastname = SVAL(p,6);
+                }
+                DEBUG(4,("list_files %d %d %d %d\n", ff_searchcount, ff_eos, "(ff_lastname)", First));
+
+                if (ff_searchcount == 0) {
+                        SAFE_FREE(rdata);
+                        SAFE_FREE(rparam);
                         break;
+                }
 
                 /* point to the data bytes */
@@ -1149 +1204 @@
                 finfo.easize = -1;
                 /* we might need the lastname for continuations */
-                if (ff_lastname > 0) {
-                        switch(info_level) {
-                                case 260:
-                                        clistr_pull(cli, mask, p+ff_lastname,
-                                                    sizeof(mask), 
-                                                    data_len-ff_lastname,
-                                                    STR_TERMINATE);
-                                        break;
-                                case 1:
-                                case 2:
-                                        clistr_pull(cli, mask, p+ff_lastname+1,
-                                                    sizeof(mask), 
-                                                    -1,
-                                                    STR_TERMINATE);
-                                        break;
-                                }
+                for (p2=p,i=0;i<ff_searchcount;i++) {
+                        if ((info_level == 260) && (i == ff_searchcount-1)) {
+                                /* Last entry - fixup the last offset length. */
+                                SIVAL(p2,0,PTR_DIFF((rdata + data_len),p2));
+                        }
+                        p2 += _os2_interpret_long_filename(cli,info_level,p2,&finfo,
+                                                        &resume_key,&last_name_raw,&last_name_raw_len);
+
+                        if (!First && *mask && strcsequal(finfo.fname, mask)) {
+                                DEBUG(0,("Error: Looping in FIND_NEXT as name %s has already been seen?\n",
+                                        finfo.fname));
+                                ff_eos = 1;
+                                break;
+                        }
+                }
+
+                if (ff_searchcount > 0) {
+                        pstrcpy(mask, finfo.fname);
                 } else {
                         pstrcpy(mask,"");
                 }
- 
+
+                /* grab the data for later use */
                 /* and add them to the dirlist pool */
-                tdl = Realloc(dirlist,dirlist_len + data_len);
-
-                if (!tdl) {
+                dirlist = (char *)SMB_REALLOC(dirlist,dirlist_len + data_len);
+
+                if (!dirlist) {
                         DEBUG(0,("cli_list_new: Failed to expand dirlist\n"));
+                        SAFE_FREE(rdata);
+                        SAFE_FREE(rparam);
                         break;
-                } else {
-                        dirlist = tdl;
-                }
-
-                /* put in a length for the last entry, to ensure we can chain entries 
-                   into the next packet */
-                for (p2=p,i=0;i<(ff_searchcount-1);i++)
-                        p2 += interpret_long_filename(cli,info_level,p2,NULL);
-                SSVAL(p2,0,data_len - PTR_DIFF(p2,p));
-
-                /* grab the data for later use */
+                }
+
                 memcpy(dirlist+dirlist_len,p,data_len);
                 dirlist_len += data_len;
@@ -1203 +1254 @@
         }
 
-        DEBUG(3,("total received %d entries\n", total_received));
-        for (p=dirlist,i=0;i<total_received;i++) {
-                p += interpret_long_filename(cli,info_level,p,&finfo);
-                fn(&finfo, Mask, state);
-        }
-
-        /* free up the dirlist buffer */
+        mnt = cli_cm_get_mntpoint( cli );
+
+        /* see if the server disconnected or the connection otherwise failed */
+        if (cli_is_error(cli)) {
+                total_received = -1;
+        } else {
+                /* no connection problem.  let user function add each entry */
+                for (p=dirlist,i=0;i<total_received;i++) {
+                        p += _os2_interpret_long_filename(cli, info_level, p,
+                                                     &finfo,NULL,NULL,NULL);
+                        fn( mnt,&finfo, Mask, state );
+                }
+        }
+
+        /* free up the dirlist buffer and last name raw blob */
         SAFE_FREE(dirlist);
+        data_blob_free(&last_name_raw);
         return(total_received);
 }