ref: ea5858d425d540f5f7113e165db709d74554a811
parent: d1e47ee675ab27d5f6b8a64460ed14e8ee9f8744
author: Yaroslav Kolomiiets <[email protected]>
date: Fri Aug 5 06:25:54 EDT 2016
cosmetic renames
--- a/dat.h
+++ b/dat.h
@@ -112,7 +112,7 @@
Mconnected, /* S: MCS Connect Response + GCC Confce Create Resp */
Mactivated, /* C: MCS Confirm Active */
Mclosing, /* S: Disconnect Provider Ultimatum */
- Mvcdata, /* S,C: MCS virtual channel data, raw */
+ Mvchan, /* S,C: MCS virtual channel data, raw */
Async, /* C: MPAS 2.2.1.14 Client Synchronize PDU */
Actl, /* C: MPAS 2.2.1.15 Control PDU */
Afontls, /* C: MPAS 2.2.1.18 Client Font List PDU */
@@ -139,7 +139,7 @@
int type;
int negproto; /* Xconnect, Xconnected */
int mcsuid; /* Mattached, Mjoin, Mactivated, Async & more */
- int chanid; /* Mjoin, Mvcdata */
+ int chanid; /* Mjoin, Mvchan */
int originid; /* Mactivated, Async, Actl, Afontls, Ainput, Dsupress */
int shareid; /* Mactivated, Async, Actl, Afontls, Ainput, Dsupress */
int ver; /* Mconnect, Mconnected */
@@ -159,13 +159,13 @@
int dologin; /* Dclientinfo */
int mtype; /* Ainput */
ulong msec; /* Ainput */
- ulong flags; /* Ainput, Mvcdata */
+ ulong flags; /* Ainput, Mvchan */
int iarg[2]; /* Ainput */
int action; /* Actl */
int allow; /* Dsupress */
- uchar* data; /* Mvcdata, Aupdate */
- uint ndata; /* Mvcdata, Aupdate */
- uint len; /* Mvcdata */
+ uchar* data; /* Mvchan, Aupdate */
+ uint ndata; /* Mvchan, Aupdate */
+ uint len; /* Mvchan */
int (*getshare)(Share*, uchar*, uint); /* Aupdate */
};
@@ -188,7 +188,7 @@
Msgput putlicensemsg;
void respondlicense(Rdp*,Msg*);
-void scanvcdata(Rdp*, Msg*);
+void scanvc(Rdp*, Msg*);
void scanupdates(Rdp*, Msg*);
enum /* Share.type */
--- a/msg.c
+++ b/msg.c
@@ -184,7 +184,7 @@
/* 2.2.1.13.2 Client Confirm Active PDU */
return putconfirmactive(b, nb, m);
- case Mvcdata:
+ case Mvchan:
nld = m->ndata+8;
p = txprep(b, nb, nld, m->chanid, m->originid, 0);
if(p == nil)
@@ -381,7 +381,7 @@
if(p == nil)
return -1;
if(m->chanid != GLOBALCHAN){- m->type = Mvcdata;
+ m->type = Mvchan;
m->len = GLONG(p+0);
m->flags = GLONG(p+4);
m->data = p+8;
--- a/rd.c
+++ b/rd.c
@@ -234,8 +234,8 @@
switch(r.type){case Mclosing:
return;
- case Mvcdata:
- scanvcdata(c, &r);
+ case Mvchan:
+ scanvc(c, &r);
break;
case Aupdate:
scanupdates(c, &r);
--- a/vchan.c
+++ b/vchan.c
@@ -63,7 +63,7 @@
}
void
-scanvcdata(Rdp* c, Msg* m)
+scanvc(Rdp* c, Msg* m)
{Vchan* vc;
int n;
@@ -109,7 +109,7 @@
if(vc->mcsid < 0)
return -1;
- t.type = Mvcdata;
+ t.type = Mvchan;
t.originid = c->userchan;
t.chanid = vc->mcsid;
t.flags = First | Vis;