Print this page
7388 Support DHCP Client FQDN. Allow IAID/DUID for all v4.

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/nwamcfg_grammar.y
          +++ new/usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/nwamcfg_grammar.y
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * If applicable, add the following below this CDDL HEADER, with the
  17   17   * fields enclosed by brackets "[]" replaced with your own identifying
  18   18   * information: Portions Copyright [yyyy] [name of copyright owner]
  19   19   *
  20   20   * CDDL HEADER END
  21   21   */
  22   22  
  23   23  /*
  24   24   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  25   25   * Use is subject to license terms.
       26 + * Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
  26   27   */
  27   28  
  28   29  #include <stdio.h>
  29   30  #include <sys/types.h>
  30   31  
  31   32  #include "nwamcfg.h"
  32   33  
  33   34  static cmd_t *cmd = NULL;               /* Command being processed */
  34   35  
  35   36  /* yacc externals */
↓ open down ↓ 24 lines elided ↑ open up ↑
  60   61  %token IPV6_ADDRSRC IPV6_ADDR IPV6_DEFAULT_ROUTE
  61   62  %token ENM_STATE ENM_FMRI ENM_START ENM_STOP
  62   63  %token LOC_NAMESERVICES LOC_NAMESERVICES_CONFIG
  63   64  %token LOC_DNS_CONFIGSRC LOC_DNS_DOMAIN LOC_DNS_SERVERS LOC_DNS_SEARCH
  64   65  %token LOC_NIS_CONFIGSRC LOC_NIS_SERVERS
  65   66  %token LOC_LDAP_CONFIGSRC LOC_LDAP_SERVERS
  66   67  %token LOC_DEFAULT_DOMAIN LOC_NFSV4_DOMAIN
  67   68  %token LOC_IPF_CONFIG LOC_IPF_V6_CONFIG
  68   69  %token LOC_IPNAT_CONFIG LOC_IPPOOL_CONFIG LOC_IKE_CONFIG LOC_IPSECPOL_CONFIG
  69   70  %token WLAN_BSSIDS WLAN_PRIORITY WLAN_KEYNAME WLAN_KEYSLOT WLAN_SECURITY_MODE
       71 +%token IP_PRIMARY IP_REQHOST
  70   72  
  71   73  %type <strval> TOKEN EQUAL OPTION
  72   74  %type <ival> resource1_type LOC NCP ENM WLAN
  73   75  %type <ival> resource2_type NCU
  74   76  %type <ival> ncu_class_type PHYS IP
  75   77  %type <ival> property_type UNKNOWN ACTIVATION_MODE CONDITIONS ENABLED
  76   78      TYPE CLASS PARENT PRIORITY_GROUP PRIORITY_MODE
  77   79      LINK_MACADDR LINK_AUTOPUSH LINK_MTU
  78   80      IP_VERSION IPV4_ADDRSRC IPV4_ADDR IPV4_DEFAULT_ROUTE
  79   81      IPV6_ADDRSRC IPV6_ADDR IPV6_DEFAULT_ROUTE
  80   82      ENM_STATE ENM_FMRI ENM_START ENM_STOP
  81   83      LOC_NAMESERVICES LOC_NAMESERVICES_CONFIG
  82   84      LOC_DNS_CONFIGSRC LOC_DNS_DOMAIN LOC_DNS_SERVERS LOC_DNS_SEARCH
  83   85      LOC_NIS_CONFIGSRC LOC_NIS_SERVERS
  84   86      LOC_LDAP_CONFIGSRC LOC_LDAP_SERVERS
  85   87      LOC_DEFAULT_DOMAIN LOC_NFSV4_DOMAIN
  86   88      LOC_IPF_CONFIG LOC_IPF_V6_CONFIG
  87   89      LOC_IPNAT_CONFIG LOC_IPPOOL_CONFIG LOC_IKE_CONFIG LOC_IPSECPOL_CONFIG
  88   90      WLAN_BSSIDS WLAN_PRIORITY WLAN_KEYNAME WLAN_KEYSLOT WLAN_SECURITY_MODE
       91 +    IP_PRIMARY IP_REQHOST
  89   92  %type <cmd> command
  90   93  %type <cmd> cancel_command CANCEL
  91   94  %type <cmd> clear_command CLEAR
  92   95  %type <cmd> commit_command COMMIT
  93   96  %type <cmd> create_command CREATE
  94   97  %type <cmd> destroy_command DESTROY
  95   98  %type <cmd> end_command END
  96   99  %type <cmd> exit_command EXIT
  97  100  %type <cmd> export_command EXPORT
  98  101  %type <cmd> get_command GET
↓ open down ↓ 511 lines elided ↑ open up ↑
 610  613                  $$->cmd_res1_type = -1; /* special value */
 611  614                  $$->cmd_argc = 1;
 612  615                  $$->cmd_argv[0] = $2;
 613  616                  $$->cmd_argv[1] = NULL;
 614  617          }
 615  618          |       LIST resource1_type
 616  619          {
 617  620                  command_usage(CMD_LIST);
 618  621                  YYERROR;
 619  622          }
      623 +        |       LIST OPTION resource1_type
      624 +        {
      625 +                command_usage(CMD_LIST);
      626 +                YYERROR;
      627 +        }
 620  628          |       LIST resource2_type
 621  629          {
 622  630                  command_usage(CMD_LIST);
 623  631                  YYERROR;
 624  632          }
      633 +        |       LIST OPTION resource2_type
      634 +        {
      635 +                command_usage(CMD_LIST);
      636 +                YYERROR;
      637 +        }
      638 +        |       LIST OPTION resource2_type ncu_class_type
      639 +        {
      640 +                command_usage(CMD_LIST);
      641 +                YYERROR;
      642 +        }
 625  643          |       LIST resource1_type TOKEN
 626  644          {
 627  645                  /* list enm/loc/ncp test */
 628  646                  if (($$ = alloc_cmd()) == NULL)
 629  647                          YYERROR;
 630  648                  cmd = $$;
 631  649                  $$->cmd_num = CMD_LIST;
 632  650                  $$->cmd_handler = &list_func;
 633  651                  $$->cmd_res1_type = $2;
 634  652                  $$->cmd_argc = 1;
↓ open down ↓ 101 lines elided ↑ open up ↑
 736  754          |       SELECT resource1_type
 737  755          {
 738  756                  command_usage(CMD_SELECT);
 739  757                  YYERROR;
 740  758          }
 741  759          |       SELECT resource2_type
 742  760          {
 743  761                  command_usage(CMD_SELECT);
 744  762                  YYERROR;
 745  763          }
      764 +        |       SELECT resource2_type ncu_class_type
      765 +        {
      766 +                command_usage(CMD_SELECT);
      767 +                YYERROR;
      768 +        }
 746  769          |       SELECT resource1_type TOKEN
 747  770          {
 748  771                  /* select enm/loc/ncp test */
 749  772                  if (($$ = alloc_cmd()) == NULL)
 750  773                          YYERROR;
 751  774                  cmd = $$;
 752  775                  $$->cmd_num = CMD_SELECT;
 753  776                  $$->cmd_handler = &select_func;
 754  777                  $$->cmd_res1_type = $2;
 755  778                  $$->cmd_argc = 1;
↓ open down ↓ 137 lines elided ↑ open up ↑
 893  916          |       LOC_IPF_V6_CONFIG       { $$ = PT_LOC_IPF_V6_CONFIG; }
 894  917          |       LOC_IPNAT_CONFIG        { $$ = PT_LOC_IPNAT_CONFIG; }
 895  918          |       LOC_IPPOOL_CONFIG       { $$ = PT_LOC_IPPOOL_CONFIG; }
 896  919          |       LOC_IKE_CONFIG          { $$ = PT_LOC_IKE_CONFIG; }
 897  920          |       LOC_IPSECPOL_CONFIG     { $$ = PT_LOC_IPSECPOL_CONFIG; }
 898  921          |       WLAN_BSSIDS             { $$ = PT_WLAN_BSSIDS; }
 899  922          |       WLAN_PRIORITY           { $$ = PT_WLAN_PRIORITY; }
 900  923          |       WLAN_KEYNAME            { $$ = PT_WLAN_KEYNAME; }
 901  924          |       WLAN_KEYSLOT            { $$ = PT_WLAN_KEYSLOT; }
 902  925          |       WLAN_SECURITY_MODE      { $$ = PT_WLAN_SECURITY_MODE; }
      926 +        |       IP_PRIMARY              { $$ = PT_IP_PRIMARY; }
      927 +        |       IP_REQHOST              { $$ = PT_IP_REQHOST; }
 903  928  
 904  929  %%
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX