=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/oxx.hh,v retrieving revision 1.1 retrieving revision 1.4 diff -u -p -r1.1 -r1.4 --- OpenXM/src/kan96xx/plugin/oxx.hh 1999/10/08 02:12:05 1.1 +++ OpenXM/src/kan96xx/plugin/oxx.hh 2000/12/03 07:29:40 1.4 @@ -1,9 +1,12 @@ +/*$OpenXM: OpenXM/src/kan96xx/plugin/oxx.hh,v 1.3 2000/02/24 12:33:48 takayama Exp $*/ else if (strcmp(key,"oxCreateClient") == 0) { if (size != 4) errorKan1("%s\n","[(oxCreateClient) ip dataport controlport] extension client."); + if (SecureMode) errorKan1("%s\n","Security violation for oxCreateClient."); rob = KoxCreateClient(getoa(obj,1),getoa(obj,2),getoa(obj,3)); } else if (strcmp(key,"oxCreateClientFile") == 0) { if (size != 3) errorKan1("%s\n","[(oxCreateClientFile) fname mode] extension client."); + if (SecureMode) errorKan1("%s\n","Security violation for oxCreateClientFile."); rob = KoxCreateClient(getoa(obj,1),getoa(obj,2),getoa(obj,2)); /* dummy */ } @@ -38,8 +41,12 @@ else if (strcmp(key,"oxMultiSelect") == 0) { rob = KoxMultiSelect(getoa(obj,1),getoa(obj,2)); } else if (strcmp(key,"oxWatch") == 0) { - if (size != 2) errorKan1("%s\n","[(oxWatch) client] extension obj"); - rob = KoxWatch(getoa(obj,1),rob); /* rob is dummy for now. */ + if (size > 2) errorKan1("%s\n","[(oxWatch) client] extension obj"); + if (size == 2) { + rob = KoxWatch(getoa(obj,1),rob); /* rob is dummy for now. */ + }else { + rob = KoxWatch(KpoInteger(1),rob); + } } else if (strcmp(key,"oxCloseClient") == 0) { if (size != 2) errorKan1("%s\n","[(oxCloseClient) client] extension obj"); @@ -63,10 +70,12 @@ else if (strcmp(key,"oxGenPass") == 0) { } else if (strcmp(key,"oxGetPort") == 0) { if (size != 2) errorKan1("%s\n","[(oxGetPort) host] extension obj"); + if (SecureMode) errorKan1("%s\n","Security violation for oxGetPort."); rob = KoxGetPort(getoa(obj,1)); } else if (strcmp(key,"oxCreateClient2") == 0) { if (size != 4) errorKan1("%s\n","[(oxCreateClient2) peer ipmask pass] extension client."); + if (SecureMode) errorKan1("%s\n","Security violation for oxCreateClient2."); rob = KoxCreateClient2(getoa(obj,1),getoa(obj,2),getoa(obj,3)); } else if (strcmp(key,"oxPrintMessage") == 0) { @@ -91,6 +100,24 @@ else if (strcmp(key,"oxPrintMessage") == 0) { errorKan1("%s\n","[(oxPrintMessge) level] extension obj, integer level"); OXprintMessage = KopInteger(obj1); rob = KpoInteger(OXprintMessage); + } +} +else if (strcmp(key,"oxPushCMD") == 0) { + if (size == 3) { + lockCtrlCForOx(); + rob = KoxPushCMD(getoa(obj,1),getoa(obj,2)); + unlockCtrlCForOx(); + }else { + errorKan1("%s\n","[(oxPushCMD) client SM_id] extension result."); + } +} +else if (strcmp(key,"oxPushCMO") == 0) { + if (size == 3) { + lockCtrlCForOx(); + rob = KoxPushCMO(getoa(obj,1),getoa(obj,2)); + unlockCtrlCForOx(); + }else { + errorKan1("%s\n","[(oxPushCMO) client obj] extension result."); } }