[Linux-decnet-commit] CVS: dnprogs/libdap protocol.cc,1.11,1.12 protocol.h,1.6,1.7

[Patrick C. <pa...@us...>]

Update of /cvsroot/linux-decnet/dnprogs/libdap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6167

Modified Files:
	protocol.cc protocol.h 
Log Message:
Add some more DAP fields


Index: protocol.cc
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/libdap/protocol.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** protocol.cc	26 Jan 2005 14:06:59 -0000	1.11
--- protocol.cc	1 Sep 2005 12:53:04 -0000	1.12
***************
*** 934,937 ****
--- 934,939 ----
      if (ctlmenu.get_bit(4))  hsh.write(c);
      if (ctlmenu.get_bit(5))  display.write(c);
+     if (ctlmenu.get_bit(6))  blkcnt.write(c);
+     if (ctlmenu.get_bit(7))  usz.write(c);
      return c.write();
  }
***************
*** 947,950 ****
--- 949,954 ----
      if (ctlmenu.get_bit(4) &&  !hsh.read(c)) return false;
      if (ctlmenu.get_bit(5) &&  !display.read(c)) return false;
+     if (ctlmenu.get_bit(6) &&  !blkcnt.read(c)) return false;
+     if (ctlmenu.get_bit(7) &&  !usz.read(c)) return false;
      return true;
  }
***************
*** 1051,1054 ****
--- 1055,1080 ----
  }
  
+ void dap_control_message::set_blkcnt(int f)
+ {
+     blkcnt.set_byte(0,f);
+     ctlmenu.set_bit(6);
+ }
+ 
+ int dap_control_message::get_blkcnt()
+ {
+     return blkcnt.get_byte(0);
+ }
+ 
+ void dap_control_message::set_usz(int f)
+ {
+     usz.set_short(f);
+     ctlmenu.set_bit(7);
+ }
+ 
+ int dap_control_message::get_usz()
+ {
+     return usz.get_short();
+ }
+ 
  //------------------------ dap_contran_message() ------------------------------
  

Index: protocol.h
===================================================================
RCS file: /cvsroot/linux-decnet/dnprogs/libdap/protocol.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** protocol.h	1 Sep 2005 08:20:49 -0000	1.6
--- protocol.h	1 Sep 2005 12:53:04 -0000	1.7
***************
*** 226,229 ****
--- 226,242 ----
      static const int OS_RSX11MP = 12;
      static const int OS_COPOS11 = 13;
+     static const int OS_POS     = 14;
+     static const int OS_VAXLELN = 15;
+     static const int OS_CPM     = 16;
+     static const int OS_MSDOS   = 17;
+     static const int OS_ULTRIX  = 18;
+     static const int OS_ULTRIX11 = 19;
+     static const int OS_DTF_MVS = 21;
+     static const int OS_MACOS   = 22;
+     static const int OS_OS2     = 23;
+     static const int OS_DTF_VM  = 24;
+     static const int OS_OSF1    = 25;
+     static const int OS_WIN_NT  = 26;
+     static const int OS_WIN_95  = 27;
  
   private:
***************
*** 350,353 ****
--- 363,367 ----
      static const int FB$BLK = 3;
      static const int FB$LSA = 6;
+     static const int FB$MACY11 = 7;
  
      //FOPs:
***************
*** 479,482 ****
--- 493,498 ----
      static const int FB$BIO = 5;
      static const int FB$BRO = 6;
+     static const int FB$APP = 7; // FAC (Append)
+     static const int FB$NIL = 7; // SHR (no access by other users)
  
      // bits for DISPLAY
***************
*** 489,492 ****
--- 505,512 ----
      static const int DISPLAY_ACL     = 7;
      static const int DISPLAY_NAME    = 8;
+     static const int DISPLAY_3PTNAME = 9;
+     static const int DISPLAY_COLLTBL = 10;
+     static const int DISPLAY_CDA     = 11;
+     static const int DISPLAY_TCL     = 12;
  
      // masks for DISPLAY
***************
*** 499,502 ****
--- 519,526 ----
      static const int DISPLAY_ACL_MASK     = 128;
      static const int DISPLAY_NAME_MASK    = 256;
+     static const int DISPLAY_3PTNAME_MASK = 512;
+     static const int DISPLAY_COLLTBL_MASK = 1024;
+     static const int DISPLAY_CDA_MASK    = 2048;
+     static const int DISPLAY_TCL_MASK    = 4096;
  
   private:
***************
*** 522,526 ****
          rop(6),
  	hsh(5),
!         display(4)
  	{msg_type = CONTROL;}
  
--- 546,552 ----
          rop(6),
  	hsh(5),
!         display(4),
! 	blkcnt(1),
! 	usz(2)
  	{msg_type = CONTROL;}
  
***************
*** 536,539 ****
--- 562,567 ----
      void set_rop(int f);
      void set_display(int);
+     void set_blkcnt(int);
+     void set_usz(int);
  
      int   get_ctlfunc();
***************
*** 544,547 ****
--- 572,577 ----
      int   get_display();
      unsigned long get_long_key();
+     int   get_blkcnt();
+     int   get_usz();
  
      // ctlfunc - Control functions:
***************
*** 607,610 ****
--- 637,642 ----
      dap_image hsh;
      dap_ex    display;
+     dap_bytes blkcnt;
+     dap_bytes usz;
  };
  
***************
*** 624,627 ****
--- 656,661 ----
      static const int ABORT     = 3;
      static const int RESUME    = 4;
+     static const int TERMINATE = 5;
+     static const int RESYNC    = 6;
  
      int get_confunc();
***************
*** 672,675 ****
--- 706,712 ----
      static const int END_OF_STREAM = 4;
      static const int SKIP          = 5;
+     static const int CHANGE_BEGIN  = 6;
+     static const int CHANGE_END    = 7;
+     static const int TERMINATE     = 8;
  
   private: