|
@@ -8,10 +8,10 @@
|
|
|
*/
|
|
|
|
|
|
ushort smbnhgets(uchar *);
|
|
|
-ulong smbnhgetl(uchar *);
|
|
|
+uint32_t smbnhgetl(uchar *);
|
|
|
vlong smbnhgetv(uchar *);
|
|
|
void smbhnputs(uchar *, ushort);
|
|
|
-void smbhnputl(uchar *, ulong);
|
|
|
+void smbhnputl(uchar *, uint32_t);
|
|
|
void smbhnputv(uchar *, vlong);
|
|
|
|
|
|
SMBPROCESSFN smbnegotiate;
|
|
@@ -42,9 +42,9 @@ SMBPROCESSFN smbcomlockingandx;
|
|
|
SMBPROCESSFN smbcomsetinformation;
|
|
|
SMBPROCESSFN smbcomntcreateandx;
|
|
|
|
|
|
-void *smbemalloc(ulong size);
|
|
|
-void *smbemallocz(ulong size, int clear);
|
|
|
-void smberealloc(void **pp, ulong size);
|
|
|
+void *smbemalloc(uint32_t size);
|
|
|
+void *smbemallocz(uint32_t size, int clear);
|
|
|
+void smberealloc(void **pp, uint32_t size);
|
|
|
char *smbestrdup(char *s);
|
|
|
void smbfree(void **pp);
|
|
|
|
|
@@ -60,19 +60,23 @@ int smbstringlen(SmbPeerInfo *i, char *string);
|
|
|
void smbstringprint(char **p, char *fmt, ...);
|
|
|
|
|
|
int smbucs2len(char *string);
|
|
|
-int smbstringput(SmbPeerInfo *p, ulong flags, uchar *buf, ushort n, ushort maxlen, char *string);
|
|
|
-int smbstrput(ulong flags, uchar *buf, ushort n, ushort maxlen, char *string);
|
|
|
+int smbstringput(SmbPeerInfo *p, uint32_t flags, uchar *buf, ushort n,
|
|
|
+ ushort maxlen, char *string);
|
|
|
+int smbstrput(uint32_t flags, uchar *buf, ushort n, ushort maxlen,
|
|
|
+ char *string);
|
|
|
int smbstrnput(uchar *buf, ushort n, ushort maxlen, char *string, ushort size, int upcase);
|
|
|
-int smbucs2put(ulong flags, uchar *buf, ushort n, ushort maxlen, char *string);
|
|
|
+int smbucs2put(uint32_t flags, uchar *buf, ushort n, ushort maxlen,
|
|
|
+ char *string);
|
|
|
|
|
|
void smbresponseinit(SmbSession *s, ushort maxlen);
|
|
|
int smbresponsealignl2(SmbSession *s, int l2a);
|
|
|
ushort smbresponseoffset(SmbSession *s);
|
|
|
int smbresponseputheader(SmbSession *s, SmbHeader *h, uchar errclass, ushort error);
|
|
|
-int smbresponseputandxheader(SmbSession *s, SmbHeader *h, ushort andxcommand, ulong *andxoffsetfixup);
|
|
|
+int smbresponseputandxheader(SmbSession *s, SmbHeader *h, ushort andxcommand,
|
|
|
+ uint32_t *andxoffsetfixup);
|
|
|
int smbresponseputb(SmbSession *s, uchar b);
|
|
|
int smbresponseputs(SmbSession *s, ushort s);
|
|
|
-int smbresponseputl(SmbSession *s, ulong l);
|
|
|
+int smbresponseputl(SmbSession *s, uint32_t l);
|
|
|
int smbresponseoffsetputs(SmbSession *s, ushort offset, ushort s);
|
|
|
int smbresponseputstring(SmbSession *s, int mustalign, char *string);
|
|
|
int smbresponseputstr(SmbSession *s, char *string);
|
|
@@ -86,7 +90,8 @@ int smbresponsecpy(SmbSession *s, uchar *data, ushort datalen);
|
|
|
void smbtreedisconnect(SmbSession *s, SmbTree *t);
|
|
|
void smbtreedisconnectbyid(SmbSession *s, ushort id);
|
|
|
SmbTree *smbtreeconnect(SmbSession *s, SmbService *serv);
|
|
|
-int smbchaincommand(SmbSession *s, SmbHeader *h, ulong andxfixupoffset, uchar cmd, ushort offset, SmbBuffer *b);
|
|
|
+int smbchaincommand(SmbSession *s, SmbHeader *h, uint32_t andxfixupoffset,
|
|
|
+ uchar cmd, ushort offset, SmbBuffer *b);
|
|
|
|
|
|
SmbService *smbservicefind(SmbSession *s, char *path, char *service, uchar *errclassp, ushort *errorp);
|
|
|
void smbserviceput(SmbService *serv);
|
|
@@ -96,64 +101,67 @@ int smbrap2(SmbSession *s);
|
|
|
|
|
|
void smbglobalsguess(int client);
|
|
|
|
|
|
-SmbBuffer *smbbuffernew(ulong maxlen);
|
|
|
+SmbBuffer *smbbuffernew(uint32_t maxlen);
|
|
|
void smbbufferfree(SmbBuffer **bp);
|
|
|
-SmbBuffer *smbbufferinit(void *base, void *bdata, ulong blen);
|
|
|
-ulong smbbufferwriteoffset(SmbBuffer *s);
|
|
|
-ulong smbbufferwritemaxoffset(SmbBuffer *s);
|
|
|
-ulong smbbufferreadoffset(SmbBuffer *s);
|
|
|
+SmbBuffer *smbbufferinit(void *base, void *bdata, uint32_t blen);
|
|
|
+uint32_t smbbufferwriteoffset(SmbBuffer *s);
|
|
|
+uint32_t smbbufferwritemaxoffset(SmbBuffer *s);
|
|
|
+uint32_t smbbufferreadoffset(SmbBuffer *s);
|
|
|
void *smbbufferwritepointer(SmbBuffer *s);
|
|
|
void *smbbufferreadpointer(SmbBuffer *s);
|
|
|
int smbbufferputheader(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p);
|
|
|
-int smbbufferputandxheader(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p, uchar andxcommand, ulong *andxoffsetfixup);
|
|
|
+int smbbufferputandxheader(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p, uchar andxcommand,
|
|
|
+ uint32_t *andxoffsetfixup);
|
|
|
int smbbufferputb(SmbBuffer *s, uchar b);
|
|
|
int smbbufferputs(SmbBuffer *s, ushort s);
|
|
|
-int smbbufferputl(SmbBuffer *s, ulong l);
|
|
|
-int smbbufferoffsetputs(SmbBuffer *s, ulong offset, ushort s);
|
|
|
-int smbbufferputstring(SmbBuffer *b, SmbPeerInfo *p, ulong flags, char *string);
|
|
|
+int smbbufferputl(SmbBuffer *s, uint32_t l);
|
|
|
+int smbbufferoffsetputs(SmbBuffer *s, uint32_t offset, ushort s);
|
|
|
+int smbbufferputstring(SmbBuffer *b, SmbPeerInfo *p, uint32_t flags,
|
|
|
+ char *string);
|
|
|
int smbbufferpututstring(SmbBuffer *b, SmbPeerInfo *p, int mustalign, char *string);
|
|
|
int smbbufferputucs2(SmbBuffer *b, int mustalign, char *string);
|
|
|
int smbbufferputstr(SmbBuffer *s, char *string);
|
|
|
int smbbufferputstrn(SmbBuffer *s, char *string, int len, int upcase);
|
|
|
int smbbufferputerror(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p, uchar errclass, ushort error);
|
|
|
-int smbbufferskip(SmbBuffer *s, ulong amount);
|
|
|
-ulong smbbufferspace(SmbBuffer *s);
|
|
|
+int smbbufferskip(SmbBuffer *s, uint32_t amount);
|
|
|
+uint32_t smbbufferspace(SmbBuffer *s);
|
|
|
void smbbufferreset(SmbBuffer *s);
|
|
|
-int smbbufferputbytes(SmbBuffer *s, void *data, ulong datalen);
|
|
|
-int smbbuffergetbytes(SmbBuffer *b, void *buf, ulong len);
|
|
|
-void smbbuffersetreadlen(SmbBuffer *b, ulong len);
|
|
|
-int smbbuffertrimreadlen(SmbBuffer *b, ulong len);
|
|
|
-ulong smbbufferwritespace(SmbBuffer *b);
|
|
|
+int smbbufferputbytes(SmbBuffer *s, void *data, uint32_t datalen);
|
|
|
+int smbbuffergetbytes(SmbBuffer *b, void *buf, uint32_t len);
|
|
|
+void smbbuffersetreadlen(SmbBuffer *b, uint32_t len);
|
|
|
+int smbbuffertrimreadlen(SmbBuffer *b, uint32_t len);
|
|
|
+uint32_t smbbufferwritespace(SmbBuffer *b);
|
|
|
int smbbuffergets(SmbBuffer *b, ushort *sp);
|
|
|
-int smbbuffergetstr(SmbBuffer *b, ulong flags, char **sp);
|
|
|
+int smbbuffergetstr(SmbBuffer *b, uint32_t flags, char **sp);
|
|
|
int smbbuffergetstrinline(SmbBuffer *b, char **sp);
|
|
|
int smbbuffergetstrn(SmbBuffer *b, ushort size, char **sp);
|
|
|
-int smbbuffergetstring(SmbBuffer *b, SmbHeader *h, ulong flags, char **sp);
|
|
|
-int smbbuffergetucs2(SmbBuffer *b, ulong flags, char **sp);
|
|
|
-void *smbbufferpointer(SmbBuffer *b, ulong offset);
|
|
|
+int smbbuffergetstring(SmbBuffer *b, SmbHeader *h, uint32_t flags, char **sp);
|
|
|
+int smbbuffergetucs2(SmbBuffer *b, uint32_t flags, char **sp);
|
|
|
+void *smbbufferpointer(SmbBuffer *b, uint32_t offset);
|
|
|
int smbbuffergetb(SmbBuffer *b, uchar *bp);
|
|
|
-int smbbuffergetl(SmbBuffer *b, ulong *lp);
|
|
|
+int smbbuffergetl(SmbBuffer *b, uint32_t *lp);
|
|
|
int smbbuffergetv(SmbBuffer *b, vlong *vp);
|
|
|
-ulong smbbufferreadspace(SmbBuffer *b);
|
|
|
-void smbbufferwritelimit(SmbBuffer *b, ulong limit);
|
|
|
-int smbbufferreadskipto(SmbBuffer *b, ulong offset);
|
|
|
-int smbbufferpushreadlimit(SmbBuffer *b, ulong offset);
|
|
|
+uint32_t smbbufferreadspace(SmbBuffer *b);
|
|
|
+void smbbufferwritelimit(SmbBuffer *b, uint32_t limit);
|
|
|
+int smbbufferreadskipto(SmbBuffer *b, uint32_t offset);
|
|
|
+int smbbufferpushreadlimit(SmbBuffer *b, uint32_t offset);
|
|
|
int smbbufferpopreadlimit(SmbBuffer *b);
|
|
|
int smbbufferalignl2(SmbBuffer *b, int al2);
|
|
|
-int smbbufferwritebackup(SmbBuffer *b, ulong offset);
|
|
|
-int smbbufferreadbackup(SmbBuffer *b, ulong offset);
|
|
|
-int smbbufferfixuprelatives(SmbBuffer *b, ulong fixupoffset);
|
|
|
-int smbbufferfixuprelativel(SmbBuffer *b, ulong fixupoffset);
|
|
|
-int smbbufferfixuprelativeinclusivel(SmbBuffer *b, ulong fixupoffset);
|
|
|
-int smbbufferfixupabsolutes(SmbBuffer *b, ulong fixupoffset);
|
|
|
-int smbbufferfixupabsolutel(SmbBuffer *b, ulong fixupoffset);
|
|
|
-int smbbufferfixupl(SmbBuffer *b, ulong fixupoffset, ulong val);
|
|
|
+int smbbufferwritebackup(SmbBuffer *b, uint32_t offset);
|
|
|
+int smbbufferreadbackup(SmbBuffer *b, uint32_t offset);
|
|
|
+int smbbufferfixuprelatives(SmbBuffer *b, uint32_t fixupoffset);
|
|
|
+int smbbufferfixuprelativel(SmbBuffer *b, uint32_t fixupoffset);
|
|
|
+int smbbufferfixuprelativeinclusivel(SmbBuffer *b, uint32_t fixupoffset);
|
|
|
+int smbbufferfixupabsolutes(SmbBuffer *b, uint32_t fixupoffset);
|
|
|
+int smbbufferfixupabsolutel(SmbBuffer *b, uint32_t fixupoffset);
|
|
|
+int smbbufferfixupl(SmbBuffer *b, uint32_t fixupoffset, uint32_t val);
|
|
|
int smbbufferputv(SmbBuffer *b, vlong v);
|
|
|
int smbbufferputack(SmbBuffer *b, SmbHeader *h, SmbPeerInfo *p);
|
|
|
-int smbbufferfill(SmbBuffer *b, uchar c, ulong len);
|
|
|
-int smbbufferoffsetgetb(SmbBuffer *b, ulong offset, uchar *bp);
|
|
|
-int smbbuffercopy(SmbBuffer *to, SmbBuffer *from, ulong amount);
|
|
|
-int smbbufferoffsetcopystr(SmbBuffer *b, ulong offset, char *buf, int buflen, int *lenp);
|
|
|
+int smbbufferfill(SmbBuffer *b, uchar c, uint32_t len);
|
|
|
+int smbbufferoffsetgetb(SmbBuffer *b, uint32_t offset, uchar *bp);
|
|
|
+int smbbuffercopy(SmbBuffer *to, SmbBuffer *from, uint32_t amount);
|
|
|
+int smbbufferoffsetcopystr(SmbBuffer *b, uint32_t offset, char *buf,
|
|
|
+ int buflen, int *lenp);
|
|
|
|
|
|
SmbClient *smbconnect(char *to, char *share, char **errmsgp);
|
|
|
void smbclientfree(SmbClient *s);
|
|
@@ -201,20 +209,21 @@ void smbsearchclosebyid(SmbSession *s, ushort sid);
|
|
|
|
|
|
void smbseterror(SmbSession *s, uchar errclass, ushort error);
|
|
|
|
|
|
-void smbplan9time2datetime(ulong time, int tzoff, ushort *datep, ushort *timep);
|
|
|
-ulong smbdatetime2plan9time(ushort date, ushort time, int tzoff);
|
|
|
-vlong smbplan9time2time(ulong time);
|
|
|
-ulong smbplan9time2utime(ulong time, int tzoff);
|
|
|
-ulong smbutime2plan9time(ulong time, int tzoff);
|
|
|
-ulong smbtime2plan9time(vlong);
|
|
|
+void smbplan9time2datetime(uint32_t time, int tzoff, ushort *datep,
|
|
|
+ ushort *timep);
|
|
|
+uint32_t smbdatetime2plan9time(ushort date, ushort time, int tzoff);
|
|
|
+vlong smbplan9time2time(uint32_t time);
|
|
|
+uint32_t smbplan9time2utime(uint32_t time, int tzoff);
|
|
|
+uint32_t smbutime2plan9time(uint32_t time, int tzoff);
|
|
|
+uint32_t smbtime2plan9time(vlong);
|
|
|
void smbpathcanon(char *path);
|
|
|
void smbpathsplit(char *path, char **dirp, char **namep);
|
|
|
|
|
|
-ushort smbplan9mode2dosattr(ulong mode);
|
|
|
-ulong smbdosattr2plan9wstatmode(ulong oldmode, ushort attr);
|
|
|
-ulong smbdosattr2plan9mode(ushort attr);
|
|
|
+ushort smbplan9mode2dosattr(uint32_t mode);
|
|
|
+uint32_t smbdosattr2plan9wstatmode(uint32_t oldmode, ushort attr);
|
|
|
+uint32_t smbdosattr2plan9mode(ushort attr);
|
|
|
|
|
|
-ulong smbplan9length2size32(vlong size);
|
|
|
+uint32_t smbplan9length2size32(vlong size);
|
|
|
|
|
|
void smbfileclose(SmbSession *s, SmbFile *f);
|
|
|
|
|
@@ -235,7 +244,9 @@ vlong smbl2roundupvlong(vlong v, int l2);
|
|
|
|
|
|
int smblistencifs(SMBCIFSACCEPTFN *accept);
|
|
|
|
|
|
-int smbnetserverenum2(SmbClient *c, ulong stype, char *domain, int *entriesp, SmbRapServerInfo1 **sip, char **errmsgp);
|
|
|
+int smbnetserverenum2(SmbClient *c, uint32_t stype, char *domain,
|
|
|
+ int *entriesp, SmbRapServerInfo1 **sip,
|
|
|
+ char **errmsgp);
|
|
|
|
|
|
int smbbuffergetheader(SmbBuffer *b, SmbHeader *h, uchar **parametersp, ushort *bytecountp);
|
|
|
int smbbuffergetandcheckheader(SmbBuffer *b, SmbHeader *h, uchar command, int response,
|
|
@@ -250,9 +261,9 @@ int smbmatch(char *name, Reprog *rep);
|
|
|
Reprog *smbmkrep(char *pattern);
|
|
|
|
|
|
int smbclientopen(SmbClient *c, ushort mode, char *name, uchar *errclassp, ushort *errorp, ushort *fid, ushort *attrp,
|
|
|
-ulong *mtimep, ulong *sizep, ushort *accessallowedp, char **errmsgp);
|
|
|
+uint32_t *mtimep, uint32_t *sizep, ushort *accessallowedp, char **errmsgp);
|
|
|
|
|
|
-Rune smbruneconvert(Rune r, ulong flags);
|
|
|
+Rune smbruneconvert(Rune r, uint32_t flags);
|
|
|
|
|
|
int smbslut(SmbSlut *table, char *name);
|
|
|
char *smbrevslut(SmbSlut *table, int val);
|
|
@@ -266,4 +277,6 @@ SmbProcessResult smbtruncatefile(SmbSession *s, SmbFile *f, vlong offset);
|
|
|
#endif
|
|
|
|
|
|
int smbremovefile(SmbTree *t, char *dir, char *name);
|
|
|
-int smbbrowsesendhostannouncement(char *name, ulong periodms, ulong type, char *comment, char **errmsgp);
|
|
|
+int smbbrowsesendhostannouncement(char *name, uint32_t periodms,
|
|
|
+ uint32_t type, char *comment,
|
|
|
+ char **errmsgp);
|